Hard-coded the SD Card dir path for Samsung Xcover 2

Signed-off-by: Michalis Vitos <info@michalisvitos.gr>
Misc

Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>
Merge branch 'master' of github.com:ExCiteS/Sapelli
Typo

Signed-off-by: Michalis Vitos <info@michalisvitos.gr>
Merge branch 'master' of github.com:ExCiteS/Sapelli into ben_audiofeedback

Conflicts:
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/storage/db/sql/sqlite/android/AndroidSQLiteRecordStore.java
	CollectorAndroid/src/uk/ac/ucl/excites/sapelli/util/DeviceControl.java