modificaciones 25 de marzo vep
actualzacion
Merge branch 'master' of https://github.com/ingjaso/vep

Conflicts:
	static/css/bootstrap.css
	static/img/facebook.jpg
	static/img/google360.jpg
	static/img/instagram.jpg
	static/img/logo.jpg
	static/img/twitter.jpg
	view/templates/CONTACT.TPL
	view/templates/DECORATIONS.TPL
	view/templates/HOME.TPL
	view/templates/base.tpl
	view/templates/footer.tpl
	view/templates/top_menu.tpl
	view/templates_c/2a9b024a8ad0107a9c9c895973de4444a5f35329.file.DECORATIONS.tpl.php
	view/templates_c/c88134871301ecf0eb1f50af84db129e8a5e4967.file.CONTACT.tpl.php
	view/templates_c/f35dcb18921a8961078ddc756835e56182773ba8.file.HOME.tpl.php