authentication login
Merge branch 'master' of https://github.com/insanesoft/insanebox

Conflicts:
	.idea/workspace.xml