UI
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/CoraSystems/mobile/test/MyActivity.java