MENU
Merge branch 'master' of https://github.com/esbrena/TheGublys into esbrena-master

Conflicts:
	AndroidManifest.xml
	gen/com/hackaton/thegublys/R.java
	res/layout/menu_fragment_layout.xml
Merge branch 'esbrena-master'