the start of a settings menu
Merge branch 'master' of https://github.com/danielboros/Calcutron

Conflicts:
	src/com/app/Calcutron/MyActivity.java