1-1 Add feedback popup message on logout
Merge remote-tracking branch 'origin/1-2' into dev

Conflicts:
	www/js/profile.js