some shit
Merge branch 'master' of https://github.com/jingchaolin/RAJ

Conflicts:
	flow/js/weapons.js