Bunch of changes
Merge branch 'master' of github.com:m0ngr31/getrealcrm

Conflicts:
	ro-backend/apps/public/urls.py
	ro-backend/apps/public/views.py