feat/video Fix azure env vars
Merge branch 'master' of https://github.com/pitchperfect/ipitchperfect
Merge branch 'master' of https://github.com/pitchperfect/ipitchperfect

Conflicts:
	server/api/video/video.controller.js
Merge branch 'master' of https://github.com/pitchperfect/ipitchperfect
(feature/review) Add Annotations to video.  Add ipEnter directive to capture enter key click.:wq
Merge branch 'master' of https://github.com/pitchperfect/ipitchperfect into feat/review
Merge branch 'master' of https://github.com/pitchperfect/ipitchperfect into feat/review
(feature/review) Add video annotations.  Add ipEnter directive
(feature/review) Disable unit test, phantom.js not recognizing Popcorn variable
Merge pull request #37 from areagray/feat/review

Feat/review