start build processes
Merge branch 'master' into build

Conflicts:
	app/views/layouts/assets.blade.php
resolve angular dependencies
remove bower components
Merge branch 'master' into issue171

Conflicts:
	app/models/User.php
	composer.json
Adding some new .gitignores
Merge branch 'master' into issue171

Conflicts:
	app/models/User.php
	composer.json
Merge branch 'master' into issue171
Merge branch 'master' into issue171
Break all the things.
start adding test files
add mock in-memory database and FactoryMuff for tests
Merge branch 'master' into build

Conflicts:
	.gitignore
	public/js/angular/controllers.js
ignore node modules, modularize annotation service
remove reference to annotator-madison
fix likes/dislikes/flags in annotator-madison, fix annotationService
separate dashboard controllers, lint controller js files and gruntfile
fix pagedown errors
Merge branch 'master' into build

Conflicts:
	.gitignore
remove legacy js