Merge branch 'master' of https://github.com/wangyugod/yuxia

Conflicts:
	app/models/Category.scala