fix bug
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev

Conflicts:
	webapp/view/profile.jsp