Bug FIxes
Bug Fix
Merge branch 'master' into authrize

Conflicts:
	.gaedata/datastore
	ppars/views.py
clean *.pyc