Added ProgressView to the game
Merge branch 'master' into progressview

Conflicts:
	SilkRoad/StageController.m
Added merged changes from master to StageController
Finished merging all changes from master, removed a warning
Removed unnecessary method moveToNextStage
Merge pull request #12 from zsweedyk/progressview

Added the ProgressView