lots
asdasda
Merge branch 'master' of https://github.com/tbadaczewski/lantern

Conflicts:
	lib/angular/angular-animate.min.js
	lib/angular/angular-animate.min.js.map
	lib/angular/angular-cookies.min.js
	lib/angular/angular-loader.min.js
	lib/angular/angular-loader.min.js.map
	lib/angular/angular-route.min.js.map
	lib/angular/angular-sanitize.min.js.map
	lib/angular/angular.min.js.map