About us page completed
startup page skips startup if user in known
include emoticons locally
Merged

Merge branch 'master' of thetagit:thetaris/extralife

Conflicts:
	peercheck/www/result.html
	peercheck/www/startup.html
	peercheck/www/welcome.html