SINCRONIZANDO CAMBIOS
Merge remote-tracking branch 'origin/master'

Conflicts:
	tmp/bytecode/DEV/_app_views_Application_index.html
	tmp/bytecode/DEV/_app_views_Secure_login.html
	tmp/bytecode/DEV/_app_views_errors_404.html
Merge branch 'master' of https://github.com/acevallo/asys