version 1.2.1
version 1.2.1

Merge branch 'master' of github.com:rongoman/moai-toki

Conflicts:
	app/data.py