Merge branch 'master' of https://github.com/ycaihappy/mu

Conflicts:
	design/DB/mu.sql
Merge branch 'master' of https://github.com/ycaihappy/mu

Conflicts:
	design/DB/mu.sql
Merge branch 'master' of https://github.com/ycaihappy/mu