Random Key to New Users into Organizations
Restarted to commit -3
Merge branch 'master' of github.com:coderdiaz/webapnote into developer

Conflicts:
	.htaccess
	application/views/organizacion_team.php
	assets/js/app.js
Merge branch 'developer' of github.com:coderdiaz/webapnote into developer