Main menu page completed
Merge branch 'master' of https://github.com/jamesalfei/Digital2014

Conflicts:
	Android app/res/values/strings.xml