Removed separated database for users
Merge branch 'jey_qraat_site_0.1' of https://github.com/QRAAT/QRAAT into jey_qraat_site_0.1
Merge branch 'alisha' into jey_qraat_site_0.1

Conflicts:
	www/qraatview/qraatview/settings.py