* New style created
* admin page changed
Merge branch 'master' of https://github.com/19jluis92/Vatos

Conflicts:
	views/_Layouts/master.tpl