alot of shit
Merge branch 'master' of git://github.com/kvaratskhelia/sharklightning-hackathon

Conflicts:
	simpler/ermanager/urls.py
	simpler/ermanager/views.py
	simpler/simpler/urls.py