Updating model.py, constant.py, adding dummydata.py,Query.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/Google_App_Engine_SDK.xml
Updating model.py, constant.py, adding dummydata.py,Query.py