Semi-add Set Piece

Currently selecting 'Tree' will create a new trashcan image. Some of the
images are not showing up. Icons are not saved properly to frame, so
switching between frames causes a new trashcan to be added.
Set-Piece complete

Can add and delete set pieces on different frames
Cleaning TvGestureController

Condensing so there isn't so much redundant code when moving some
object.
Merge pull request #3 from nang1/nicole

Pushing SetPiece feature
Semi-Timeline and GridOptions

Added Andrew's code for timeline labels. Created layout for
GridOptionsView which adjusts the grid lines.
Basic Scene Popover
Merge pull request #5 from nang1/nicole

basic scene popover pull
Added Alerts for Descriptions stuffsdkjflkdsjfjwoij
merge conflicts should be resolved
more merging
merge conflicts should be resolved
Merge branch 'master' of https://github.com/nang1/BlockLightPrototype

Conflicts:
	Blocklight_Prototype/.DS_Store
	Blocklight_Prototype/BlockLight_Prototype/.DS_Store
	Blocklight_Prototype/Blocklight_Prototype.xcodeproj/project.pbxproj

Blocklight_Prototype/Blocklight_Prototype.xcodeproj/project.xcworkspace/
xcuserdata/nang1.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/nang1/BlockLightPrototype with my (JNN) own local stuff

Conflicts:
	Blocklight_Prototype/Blocklight_Prototype.xcodeproj/project.pbxproj