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

Conflicts:
	modules/server/router.js
	public/views/index.hbs