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

Conflicts:
	js/widget-slider.js
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
Minor corrections to test/README.md
Minor modifications to MessageBroker comments
Merge pull request #86 from ysahnpark/youngsuk

Youngsuk
updates to doc
Fixup styles

* better styles on tables, removed old unusued too generic styles
* better styles on markers (although still not done)
* better styles on sliders
wicked-lame numerical slider answertype

* added selectedItem to slider
* made numericquestion type after multiplechoice design
* committed atrocities in the answerman to make them score
* added a question to the dB
* used this question on submitTests.html
some fixes to marker display