Javascript tweaks
Merge branch 'master' into gh-pages

Conflicts:
	Build/javascripts/application.js
	javascripts/application.js