Merge pull request #21 from gnomicstudios/aranda

Seige tower and merges
fixed so Entity.Update() is called
merging...
fix check for IsActivated in ProcessAddRemoves
Merge pull request #22 from gnomicstudios/marks

Marks
work-in-progress
Merge pull request #23 from gnomicstudios/marks

work-in-progress
work-in-progress
Merge pull request #24 from gnomicstudios/marks

work-in-progress
Princess linked to seige tower, debug view with F1 and camera scrolling
Merge branch 'master' of https://github.com/gnomicstudios/GGJ13 into aranda

Conflicts:
	Gnomic.Core/Physics/PhysicsSystem.cs
	Spineless/Spineless/Entities/Princess.cs
	Spineless/Spineless/LevelScreen.cs