add process json
Merge branch 'master' of https://github.com/sinkerplus/Actually

Conflicts:
	Actually/settings.pyc
	Actually/wsgi.pyc
	Auth_App/__init__.pyc
	Auth_App/admin.pyc
	Auth_App/datautils.pyc
	Auth_App/expectcal.pyc
	Auth_App/models.pyc
	Auth_App/views.pyc
...