Merge branch 'develop'
[#29] Fix jQuery bug

* If statement in jQuery now
  tests whether custom_subject is
  selected, rather than visible,
  before hiding it.
Merge branch 'task-29-fix_custom_subject_script_bug' into develop