change
Merge branch 'master' of https://github.com/rushsinging/jTools

Conflicts:
	python/dinner/views/index.tpl