v0.1.36
Merge branch 'test' of github.com:changyou/anthCraft-mobile into test

Conflicts:
	configs/config.sample.coffee
	configs/config.test.coffee
v0.1.36