update
Merge branch 'master' of https://github.com/pontsoleil/WuWei

Conflicts:
	wuwei-m.js
Merge branch 'master' of https://github.com/pontsoleil/WuWei

Conflicts:
	pgsql.sql
	wuwei-m.js
update
Merge branch 'master' of https://github.com/pontsoleil/WuWei
merge to generate min
update