Merge branch 'master' of github.com:jpercent/foneem

Conflicts:
foneem/static/css/application.css
foneem/static/js/hvb_record-ck.js
foneem/static/js/hvb_record.js
foneem/template/record.html
Merge branch 'master' of github.com:jpercent/foneem

Conflicts:
	foneem/static/css/application.css
	foneem/static/js/hvb_record-ck.js
	foneem/static/js/hvb_record.js
	foneem/template/record.html