4-4-2014 1751
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/ProjectSettings/EditorBuildSettings.asset
Merge pull request #23 from DevenSmith/master

last second friday