First commit Melissa.
Merge remote-tracking branch 'origin/master'

Conflicts:
	AmILate/AndroidManifest.xml
	AmILate/res/layout/activity_main.xml
	AmILate/src/com/moac/android/amilate/MainActivity.java