bower added
Merge branch 'unit-tests'

Conflicts:
	test/unit/app/test.spec.js