4.pestanyes: correccio error pestanyes
Merge branch '4.pestanyes'

Conflicts:
	.gitignore
	assets/www/css/tactic.css
	bin/TurismeBatea.apk
	bin/classes.dex
	bin/resources.ap_