fix .idea
Test Android Studio integration
Merge remote-tracking branch 'origin/master'

Conflicts:
	AlarmClock/.idea/vcs.xml
fix .idea
Merge remote-tracking branch 'origin/ACL-1-fix-code-review' into ACL-1-fix-code-review