.
Merge branch 'master' of https://github.com/evendrop/angular.vanilla

Conflicts:
	js/app/controllers.js