Merge branch 'pr/7'

Conflicts:
Blocklight_Prototype/.DS_Store
Blocklight_Prototype/.DS_Store.orig
Blocklight_Prototype/BlockLight_Prototype/ActorView.h
Blocklight_Prototype/BlockLight_Prototype/ActorView.m
Blocklight_Prototype/BlockLight_Prototype/QuickStageViewController.m
Blocklight_Prototype/BlockLight_Prototype/TVGestureController.m

Blocklight_Prototype/Blocklight_Prototype.xcodeproj/project.xcworkspace/
xcuserdata/nang1.xcuserdatad/UserInterfaceState.xcuserstate
Blocklight_Prototype/Icon-72.png