v0.3.0;
Merge branch 'master' of github.com:changyou/anthCraft-dist

Conflicts:
	lib/config.development.coffee
	public/index.html
	public/scripts/b7d27e57.modules.js
	public/scripts/fa74d24b.upload_scripts.js
	public/upload-page.html
v0.3.1;