adding vendor page to angular
t
merge master into develop
creating vendor
merging with develop
merging controllers with upstream develop
fixed syntax error in controllers
adding videos service
video upload
Merge branch 'videos' into develop
Merge branch 'develop'