cambios en admin y vista
Merge branch 'master' into develop
Merge branch 'develop' into features/category_tree

Conflicts:
	application/views/home/fixture/show_fixture_view.php
	application/views/home/temp/header.php
	css/style.css
Merge branch 'features/category_tree' of https://github.com/ucielp/sonando into features/category_tree