1st Commit
Merge remote-tracking branch 'origin/mike' into mike

Conflicts:
	res/layout/activity_main.xml
Merge branch 'master' into mike