placeholder
Merge branch 'dev' into server

Conflicts:
	Singlesmingles/__pycache__/settings.cpython-33.pyc
Merge branch 'server' of https://github.com/Kovath/Singlesmingles into server
Pulling backwards
Merge branch 'dev' into server

Conflicts:
	Singlesmingles/__pycache__/settings.cpython-33.pyc
	Singlesmingles/__pycache__/urls.cpython-33.pyc
Hopefully the completion of the backend
Merge branch 'server' of https://github.com/Kovath/Singlesmingles into server
merged server down to dev