upload markup
Merge branch 'master' into upload

* master:
  refactor exercise index controller
bootstrap typeahead added
add image upload markup
disabled binding
hook up bootstrap fileupload
image added to exercise model
update resource
update action
upload bootstrap
upload.hjs fixes
upload fixes