Small updates to main class
Merge branch 'master' of https://github.com/shaunus84/who-do-you-trust-ggj14

Conflicts:
	assets/Map.swc
Fix for settings