clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
has a login landing page (without CSS) and it retrieves user/password from the database