Proseguimento Layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/itc/zappapp/Activity_Head/Activity_Menu.class
	bin/classes/com/itc/zappapp/R$id.class
	bin/classes/com/itc/zappapp/R$layout.class
	bin/classes/com/itc/zappapp/R$menu.class
	bin/classes/com/itc/zappapp/R$string.class
	bin/classes/com/itc/zappapp/R$style.class
	gen/com/itc/zappapp/R.java