prep for bihar pilot
removing pma from serverlog
reverting to pms in serverlog
updating data files containing dicts
Merge branch 'dimagi2' into test_server_alt

Conflicts:
	dimagi/scripts/case_update/person10000000128094.xml
	dimagi/scripts/generate_excel.py
	dimagi/scripts/save_mobile_data.py
	dimagi/scripts/update_functions.py
	dimagi/scripts/userfile_functions.py
	dimagi/views.py
user_case and person dict