oms1226_omswiki: auto release v2.0.0 from workplace
Merge branch 'master' of github.com:oms1226/omswiki

Conflicts:
	my_wiki.sql
Merge branch 'master' of github.com:oms1226/omswiki
oms1226_omswiki: auto release v2.0.0 from workplace