Empty index view for eaiser merging ..
Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/server/router.js
	public/views/index.hbs
Fixed bootstrap path
Renamed
Removed trash, added ash
Added request
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/views/index.hbs
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'
User microscratch template if index does not exists
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/views/index.hbs
Separated routes
Removed dead code
Better query