ajax
Merge branch 'master' of https://github.com/Noemj/governmaid
Conflicts:
	postapp/views.py

q