Merge branch 'master' of https://bitbucket.org/gioseregni/pingendo-web

Conflicts:
	public/admin/js/index.js
	public/admin/js/login.js
	public/admin/login.html
	routes/auth.js