new fronted update
Update
final update, first front-end release to pull
Merge branch 'master' of https://github.com/juandelossantos/improtools into juandelossantos-master

Conflicts:
	protected/views/estrategies/view.php
	protected/views/levels/view.php
	protected/views/users/admin.php
Merge branch 'juandelossantos-master'