front tab udpate 11/12
landing sek front 10/12
Merge branch 'master' of https://github.com/BowlMinions/Agrosuper-Navidad

Conflicts:
	site/app/tmp/cache/persistent/agronav_cake_core_file_map
	site/app/tmp/logs/error.log
	site/app/webroot/css/main.css