fix temporary template
Merge branch 'master' of https://github.com/mpalencia/elearning

Conflicts:
	fuel/app/views/template_admin.php