MAJOR CHANGES

So many changes that go into lots of files…
Merge pull request #3 from totai/master

MAJOR CHANGES for WIP Login
new commit after merge
Add security modules
more stuff
Merge branch 'WIP-Login'

Conflicts:
	.idea/workspace.xml