5-16-2014 1738
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/ProjectSettings/TagManager.asset
	TrickyNinja/TrickyNinja.userprefs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #40 from DevenSmith/master

last build dont break