Added a unique ID on each spacetime row in simple/display that is the spacetime ID, this will
be necessary to associate a new topic with a spacetime.
Merge branch 'master' of github.com:BruceEckel/OpenSpacesBoard
fixing merge error
Merge branch 'master' of github.com:BruceEckel/OpenSpacesBoard
Adding topics

-Added a new resource type for topics (previously, there was only just a model), consisting of views and a controller
-Added a click handler on board/display when clicking on a spacetime block. This will trigger a modal dialog that allows users to add a topic
-The topic is linked to the user creating it, and the spacetime block (via ID) the action was initiated from
-Next up is displaying all active topics on the board
Merge pull request #6 from jcerise/master

Topics