Merge branch 'master' of https://github.com/titangate/LinkedInHackathon2013

Conflicts:
	Hackathon2013/Hackathon2013/MyScene.m
Merge branch 'master' of https://github.com/titangate/LinkedInHackathon2013
Add temple capture, unit engagement
Finalize battle logic
Add basic AI
shit commit
Merge branch 'master' of https://github.com/titangate/LinkedInHackathon2013
Merge branch 'master' of https://github.com/titangate/LinkedInHackathon2013
Path find
Merge branch 'master' of https://github.com/titangate/LinkedInHackathon2013
changed textures to colors, added methods for draining
added drop method
started work on connectedComponents
calconnectComp
obstacle generation works, polygon finding doesn't
resolved conflicts