Merge the javascript files into fullscreen.js
No major changes, just less repetition. Not a fan of the code
being like this (oddly-named globals, etc.), but it'll do for now.
Bundle update rails to 3.2.11
Update prompt_module.js
Update to rileylark/activeprompt's master.

Conflicts:
	app/views/prompts/fullscreen.html.erb
Reindent prompt_module.js

This was a mix of spaces and tabs, I cleaned it up and went with
two spaces for an indent. I removed a few extra blank lines too.
Keep old markers, allow clearing them

This changes to no longer removing markers by default. It also
adds a button to the teacher interface to clear the markers.

When markers are cleared, any open windows will immediately
re-set their markers, so only inactive markers will be
effectively cleared.
Merge branch 'master' of github.com:rjswanso/Red-Dot into rjswanso-master
Merge branch 'keep_old' of github.com:aschmitz/activeprompt into aschmitz-keep_old

Conflicts:
	app/assets/javascripts/prompt_module.js