fix up
login update
login updates
Merge branch 'master' of github.com:molleja/sindicato into HEAD

Conflicts:
	api/index.php
branch fixing