merging branch release-1.2
bump version code 19
Manage Alarm notification with a separate class
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	AgatteClient/src/main/AndroidManifest.xml
Better Layout for Main Activity (test rendering now works)
Add a key icon to display the authentication status of the current SSID
Update icon based on wifi SSID
bump version 23