none
Merge branch 'master' of https://github.com/sinkerplus/Actually

Conflicts:
	Actually/settings.py
	Actually/settings.pyc
	Actually/urls.pyc
	Auth_App/dbservice.pyc
	Auth_App/jsonservice.pyc