json working
jsonification / html template
Merge branch 'master' into contracts_json_template
Merge branch 'master' into contracts_json_template

Conflicts:
	social_secretary/ss_app/views.py
pep8
Merge pull request #22 from galarant/contracts_json_template

Contracts json template