changes to socketboard.ejs
changes to ejs
Typo in saveHTML
Fix double escaping of input string
Added ejs filters
lots of changes
Merge remote-tracking branch 'origin/master' into integrate

Conflicts:
	public/js/main.js
	views/welcome.ejs
Merge remote-tracking branch 'origin/dev/db-api' into integrate

Conflicts:
	database.api.js