added background
(login) modified login view
Merge branch 'origin/master'

Conflicts:
	.gitignore