edit some code for suite in gae
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
local update
edit some code
remove some main.py code to controllers
remove home class from main.py
Merge remote branch 'origin/master'

Conflicts:
	controllers/BaseHandler.py
	controllers/help.py
	main.py
	web_controller.py
Merge branch 'temp'
update singleton in main