removing non branch dir
Merge branch 'megavideo'

Conflicts:
	unit3/simple-signup/.bowerrc
	unit3/simple-signup/app.js
	unit3/simple-signup/bower.json
	unit3/simple-signup/bower/angular/.bower.json
	unit3/simple-signup/bower/angular/README.md
	unit3/simple-signup/bower/angular/angular-csp.css
	unit3/simple-signup/bower/angular/angular.js
	unit3/simple-signup/bower/angular/angular.min.js
	unit3/simple-signup/bower/angular/angular.min.js.gzip
	unit3/simple-signup/bower/angular/angular.min.js.map
	unit3/simple-signup/bower/angular/bower.json
	unit3/simple-signup/index.html
	unit3/simple-signup/style.css
	unit3/simple-signup/templates/optin.html