Fixing the user name , underscore issue
Merge branch 'api' into deploy

Conflicts:
	editCount/update_json.py
Removing .pyc