Cleanup commit for merge
Merge branch 'master' of https://github.com/lbondaryk/PlayerProto

Conflicts:
	js/widget-slider.js
Update Ocean Properties

* adding extra images and labels to Oceans example
* can append labels to carousel by accessing the .image property
* need to make three separate labels objects to highlight them all
Cleanup Submit Manager

* added submit manager to multiChoiceTests and hooked up some questions
* removed bogus config argument to submitManager function, and passed arguments
* changed button label in disabled state for multiplechoicequestion.js
SelectGroup as MC question

* added keys and lite method to selectGroup so they could function as UI element
* added selectItem() method for returning answerKeys to multiplechoicequestion widget
* added question property in config for setting whether select is to be used as a question
Labels as multiple choice inputs

* added a selectItem method to labels
* made labels highlight on click
* added property "question" to labels so they get choices when used as a question
(probably should set this automatically, it's manual now)
* used the same general strategy as with selectgroup
* added svg detection and rendering to MC
JSON for a brix activity proposed by mjl. Also a 1st pass at using it for kantorowski by Young Suk.
Some alternate ideas for activity config, with a new hookupActions section for each container

I did not finish going through the Kantorowski example to use hookupActions everywhere I think they may be used. I did do a few though.
Merge pull request #84 from mlippert/activityconfig-doc

Activityconfig doc
Merge remote-tracking branch 'upstream/master'
Add in CSS and HTML for new layouts that are going into Habitat
Merge pull request #85 from antelopeb/master

New layout methodology being used for the SanVan content
Using dropdown MC
* replaced questions in Physics example with "real" ones
* Made qs Keeling Curve
* made swappable data in KeelingCurve
Draggable markers

how cool is that.  Only a few lines of code and use of the redraw function.
Unfortunately, we don't pass the data to markers, only the scale, so I can't
make them track data points… yet.  Need a strategy for this. Maybe they are
really part of the graph.
MessageBroker with logging. Unit test of MessageBroker and EventManager
Change test/README.md for the iframe issue
Change test/README.md for the iframe issue
Minor changes to the comments on MessageBroker
Minor corrections to test/README.md
Minor corrections to test/README.md