directive under construction
Merge remote-tracking branch 'origin/master'

Conflicts:
	compressed files/angular-1.3.2/angular-1.3.2/angular-mocks.js
	compressed files/angular-1.3.2/angular-1.3.2/angular-sanitize.js
	compressed files/angular-1.3.2/angular-1.3.2/angular-scenario.js
	compressed files/angular-1.3.2/angular-1.3.2/angular.js
	compressed files/angular-strap-2.1.4/angular-strap-2.1.4/test/~1.2.0/components/angular-sanitize.js
	index.html
	scripts/controllers/controllers.js
	scripts/vendor/angular-sanitize.js
	views/location_select.html