new computer
Merge branch 'master' of https://github.com/nagey/ouiff

Conflicts:
	html/app/scripts/Controllers/LightboxCtrl.js
	html/app/scripts/Controllers/ProfileCtrl.js
	html/app/scripts/Controllers/UserCtrl.js
	html/app/scripts/Controllers/VideoListCtrl.js
Merge branch 'master' of https://github.com/nagey/ouiff

Conflicts:
	html/app/scripts/Controllers/LightboxCtrl.js
	html/app/scripts/Controllers/ProfileCtrl.js
	html/app/scripts/Controllers/UserCtrl.js
	html/app/scripts/Controllers/VideoListCtrl.js