Merge branch 'master' into satcor_master

Conflicts:
	AndroidManifest.xml

AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="cs.si.satcor"
-    android:versionCode="1230"
-    android:versionName="1.2.3"
+    android:versionCode="1240"
+    android:versionName="1.2.4"
     android:installLocation="auto" >
     <!-- VersionCode: [3]version+[1]architecture e.g 1.0.2arm is 1020, 1.1.3x86 is 1131  -->
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>