7.maquetaNatiu FEt a falta de icones definitives
7.maquetaNatiu finaltzat a falta de petites correccions
Merge branch '7.maquetaNatiu'

Conflicts:
	bin/TurismeBatea.apk
	bin/classes.dex
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/turismebatea/MainActivity$PlaceholderFragment.class
	bin/classes/com/turismebatea/MainActivity.class
	bin/classes/com/turismebatea/NavigationDrawerFragment$NavigationDrawerCallbacks.class
	bin/classes/com/turismebatea/R$drawable.class
	bin/classes/com/turismebatea/R$id.class
	bin/classes/com/turismebatea/R$integer.class
	bin/classes/com/turismebatea/R$layout.class
	bin/classes/com/turismebatea/R$menu.class
	bin/classes/com/turismebatea/R$string.class
	bin/classes/com/turismebatea/R$style.class
	bin/classes/com/turismebatea/R$styleable.class
	bin/classes/com/turismebatea/R$xml.class
	bin/resources.ap_
	src/com/turismebatea/MainActivity.java