Merge pull request #22 from DevenSmith/master

4-4-2014 1535
more changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/ProjectSettings/EditorBuildSettings.asset