Merge branch 'bowen'

Conflicts:
	app/controllers/Application.java
yh
Merge branch 'master' of https://github.com/xixixhalu/sss