Fixed login and added some styles.
Merge branch 'master' of https://github.com/Masovski/TeamDARBY

Conflicts:
	.idea/workspace.xml
	application/controllers/users.php