add cap
Merge branch 'the_cap_for_old_sites' into develop

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/main.coffee