Added load civilian method
Added civilians
Added quests
misc
Merge branch 'develop' of https://github.com/Krill/red-elephant.git into
develop

Conflicts:
	src/Engine/Collision.java