Before pull
Merge branch 'master' of https://github.com/SaveThatDish/STD.git

Conflicts:
	SaveThatDish/project.properties
Fixed issue with settings menu not showing up after logging in.