Merge branch 'release/v2.2.1' into develop
added .settings to .gitignore
Morbidmeter-android now imported to Android Studio and contains all modules, libraries and test code that originally was in 4 separate repositories.  All development now will be on this repository alone.
added 6dp margin to configure screen
found bug in SimpleDateFormat formatting msec in Android 5 emulator.  Refactoring done for now.
Due to change in handling millisecond format in Android 5, msec will have 3 digits with leading zeros
updated target SKD to 21
added changes/2.2.2.txt
bumped to v2.2.2
Merge branch 'release/v2.2.2'