。。。。。。
Merge branch 'master' of https://github.com/miser/ghost4eatme

Conflicts:
	content/data/ghost.db
1.update to 0.4.2
2.use mysql