Merge branch 'bowen'

Conflicts:
	app/controllers/Application.java
yh
Merge branch 'master' of https://github.com/xixixhalu/sss
Merge branch 'master' of https://github.com/xixixhalu/sss
Merge branch 'master' of https://github.com/xixixhalu/sss
bowen
bowen
bowen
BOWEN
Merge remote-tracking branch 'origin/Bohan-Zheng' into bowen
add json
add json
test
Merge remote-tracking branch 'origin/bowen' into Bohan-Zheng
fix
after ARB edition
remove unuseful file
fix a small bug in requirement
Merge branch 'master' into Bohan-Zheng
fixing bug