new profile files (.js/.html)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	client/router.js