Finalising before merging

sample_app/src/main/AndroidManifest.xml

@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     package="uk.co.alt236.btlescan"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="3"
-    android:versionName="0.0.3">
-
-    <uses-sdk
-        android:minSdkVersion="18"
-        android:targetSdkVersion="18"/>
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>

sample_app/src/main/res/layout/list_item_device.xml

@@ -63,7 +63,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingRight="5dp"
-                android:text="Updated:"
+                android:text="@string/label_updated"
                 android:textSize="12sp"
                 android:textStyle="bold"/>
 
@@ -187,7 +187,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingRight="5dp"
-                android:text="Descriptor:"
+                android:text="@string/label_decriptor"
                 android:textSize="12sp"
                 android:textStyle="bold"/>
 

sample_app/src/main/res/values/strings.xml

@@ -70,5 +70,6 @@
     <string name="label_state">State:</string>
     <string name="label_tx_power">TX Power:</string>
     <string name="label_uuid">UUID:</string>
-
+    <string name="label_updated">Updated:</string>
+    <string name="label_decriptor">Descriptor:</string>
 </resources>