Use image_tag/path when possible to accommodate deploying under a sub-uri
Use path_to_image instead

Since we haven an Image model and routes, image_path doesn't map right
Add basic run_html handling

Investigations, activities and sections can now be rendered
Use run_html format if we're not using jnlps

USING_JNLPS is true if APP_CONFIG[:runnables_use]:
 - is not defined
 - OR is 'otrunk_jnlp'

By setting :runnables_use to something else,
we can set the portal to render things in :run_html
Fix css reference in tiny_mce
Add iframe as ok html in tiny_mce
don't show the wait lightbox if we're not using jnlps
fix errors in test code for run_html
enhance render_partial_for to take :locals
Add test for loading previous student answers on lightweight activities
Fixup UI for for run_html rendering

- Use a plain white background
- Better 'invalid type' warnings
- Use more of the available space
In run_html, allow content to overflow horizontally
rails 3.2 and ruby 1.9.3 initial changes

mysql2 needs to increase in order to work on rails 3.1 and higher.
use patched calendar_date_select
  the official calendar_date_select uses RAILS_ROOT which doesn't exist in rails 3.2
add prototype-rails, disable debug_rjs
  it seems debug_rjs should still work based on readme:
  https://github.com/rails/prototype-rails
  But instead an error is thrown, this looks like a bug in prototype-rails.
  Here is my bug report:
  https://github.com/rails/prototype-rails/issues/10
class_inheritable_array is no longer available
  this page has info:
  http://apidock.com/rails/Class/class_attribute
  http://guides.rubyonrails.org/active_support_core_extensions.html
  Note this fix doesn't work the same way as the original so the usage of role_requirements
    needs to be checked. It actually appears it is not used anymore.
bump database_cleaner to fix error when running tests
  this was the error:
  superclass mismatch for class Mysql2Adapter (TypeError)
  /Users/scytacki/.rvm/gems/ruby-1.9.3-p125@rigse/gems/database_cleaner-0.6.7/lib/database_cleaner/active_record/truncation.rb:31:in `<module:ConnectionAdapters>'
bump themes_for_rails version to remove warnings
bump version of testing libraries
Change approach for checking ActiveRecord connection
switch prototype_legacy_helper to pickup 3.1 changes
replace calls to Given/When/Then with "step"
  this removes deprecation warning from cucumber
Use the cucumber-rails javascript_strategy section
  by setting javascript_strategy to transaction we can gain a little speed.
  this works by limiting AR to one DB connection so both the test thread
  and the server thread use the same DB connection and thus the same
  transaction.
update mock installation into cucumber
  https://github.com/cucumber/cucumber/wiki/Mocking-and-Stubbing-with-Cucumber
  without this there is a cryptic error:
  undefined method `expectation_ordering' for nil:NilClass
  which occurs because the RSpec::Mocks::setup method wasn't called
fix issues with deep_cloning in rails 3.2
  the attributes_from_column_definition method was removed
  the semantics of clone was changed so now the appropriate method
  seems to be dup instead
FlashHash#each_pair is no longer supported - FlashHash#each does the same thing
update our custom haml fork with rails 3.2 fixes from upstream
bump ci_reporter
update fails_in_themes for latest rspec
remove rack_hotfix now that we are up to v 1.3
use debugger instead of ruby-debug19
lock spreadsheet gem to earlier version to avoid non backwards compatible change
fix issues with jnlp formatting

added some more tests to catch these types of issues
extract out the saveable_types and reportable_types

They were previous delegated up the instance chain but I found no examples of
their instance-ness being used. Additionally they were were breaking when an
activity was not part of a investigation.
specify template format in rails 3.2 way
update spreadsheet gem and update column defs

the newer spreadsheet gem changed way borders are specified.
Don't use hard-coded paths
update the readme a bit for ruby 1.9.3
Merge remote-tracking branch 'origin/master' into disconnect-settings

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/02_app.rb
	db/schema.rb
	factories/maven_jnlp.rb