version 1.0.4
version 1.0.6
Merge branch 'master' of github.com:rongoman/rongoM

Conflicts:
	app/api.py
	app/conf.py
	app/data.py
	toki.py