5-9-2014 1617
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
water failed to be added last time
Merge pull request #31 from DevenSmith/master

SwordEnemy added, needs to be on a navmesh