Updated editor build settings
Merge branch 'master' of https://github.com/bennychen/gamejam2014

Conflicts:
	ProjectSettings/EditorBuildSettings.asset