my update
Merge remote-tracking branch 'origin/master' into chris

Conflicts:
	res/layout/activity_title.xml
	res/values/strings.xml
Merge remote-tracking branch 'origin/master' into chris
minor bug
Merge branch 'chris' of https://github.com/rabaut/project1
Added button manager for main menu