2-28-2014 1729 deven
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja/Assets/Prefabs/PlayerPrefab.prefab
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
	TrickyNinja/TrickyNinja/ProjectSettings/TagManager.asset
Merge branch 'DevenSmith-master' into pr/7

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset
Merge branch 'pr/7'

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset