fixed subformat bug
fixed subformat bug merge issue
Merge remote-tracking branch 'wagn/master' into fix_modal_view

Conflicts:
	mod/wikirate/set/all/wikirate.rb