fix modal view error on subformat calling
Merge remote-tracking branch 'wagn/master' into fix_modal_view

Conflicts:
	mod/wikirate/set/all/wikirate.rb
handle no modal case
added json data with all of the Cambridge stuff
Merge remote-tracking branch 'wagn/master' into backup_task_capistrano