allow for determining view coverage
allow for determining view coverage
[#696 state:resolved] add help ? for team consultations
[#696 state:resolved] add help ? for team consultations
make cucumber strict, remove merge cruft
fix statistics and improve performance 20x
Merge branch 'back_to_prototype'

Conflicts:
	app/models/user.rb
update jquery-scrollto for jquery 1.9, switch listeners from body to document, add updated jquery_ujs for ie6 fixes, fix a mailer error, fix removal of assets when editing
fix school team creation
fix flag update for team consultations, and fix the awesome nested fields to work in jquery 1.9 and in ie.
fixes build locally and allows bulk import page to be viewed in production, the latter still needs some tweaking.
remove upload progress as it does not work in jquery 1.9, and will not work with chrome anyway
silence rails 3.2 plugin deprecations
should fix build
fix tests and update devise
update travis [ci skip]
update travis [ci skip]

Conflicts:

	.travis.yml
refactoring of bulk import
Merge branch 'back_to_prototype'

Conflicts:
	Gemfile.lock
fix some br tags, fix overlib so it can handle IE versions up to 99, use custom jquery_ujs so that it sends data on a put request to force IE to add a content length header (otherwise some servers like nginx,passenger standalone return a 411 error)