2014-09-03 front-end
Merge remote-tracking branch 'origin/master'

Conflicts:
	dbas/views/index.ejs