Merge branch 'master' into asset-pipeline

Conflicts:
	static/js/application.js

static/coffee/src/calculator.coffee

@@ -10,6 +10,11 @@ class window.Calculator
   toggle: ->
     $('li.calc-main').toggleClass 'open'
     $('#calculator_wrapper #calculator_input').focus()
+    if $('.calc.closed').length
+      $('.calc').attr 'aria-label', 'Open Calculator'
+    else
+      $('.calc').attr 'aria-label', 'Close Calculator'
+
     $('.calc').toggleClass 'closed'
 
   helpToggle: ->