Added bootstrap
Added mocha-phantomjs phantomjs
Added mocha and chai bower components
Formatting
Partially integrated mocha
Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/server/router.js
Merge branch 'mocha-phantomjs'
Merge remote-tracking branch 'upstream/master'