Added Settings Menu with a single settings item. Solves #9
Added all of the easy preferences
Merge branch 'feature/settings' into develop

Conflicts:
	res/values/strings.xml

Also added *.orig to gitignore
Merge branch 'develop' of https://github.com/TAMUSeniorDesignCS/MobileApp-Android into develop