Merge remote-tracking branch 'origin/master'

Conflicts:
	bootstrap.sh
	www/app/assets/javascripts/application.js
	www/config/application.rb
	www/config/requirejs.yml
Designing list view