commit ngay 8_6_14
Merge branch 'master' of https://github.com/congtt/v_gamer

Conflicts:
	conf/application.conf