Task: Backend; Progress: 70; Message: ; Difficulty: ; Development: ;
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
	Auth_App/models.pyc
	Auth_App/views.pyc
	media/js/column-data.js
Task:backend

merge
Task:background;Progress:70;difficulty:none
Task:backend
merge operation
Task:back-end;Process:75;Difficulty:None

Complete login and logout function
Merge branch 'master' of https://github.com/sinkerplus/Actually