Merge remote-tracking branch 'tom/master'
Merge remote-tracking branch 'jw/master'
Merge remote-tracking branch 'jw/master'
added NPC class
added vector of npc's
conflict solved
Merge remote-tracking branch 'jw/master'
added sqdist to Point and added HORSE AI
Point -> Pos2 in NPC
added AI's and comment in map
fixed conflicts
Camera follows player
Fixed merge
Overlay text is now on a separate 'interface layer' so that it does not follow the camera
pic added, bots implementation completed
fixed conflicts in CruxScene
switched to isometric tiles, updated bots
added resources for bots