1-3, Begin profile friend page
1-1, Add feedback popup message on login fail/success
1-1, Updated logout behaviour to avoid using a state
1-1 Add feedback popup message on logout
1-3, Added current logged in user handling
Merge branch '1-1' into dev
Merge branch '1-3' into dev

Conflicts:
	www/js/profile.js
1-3, Logged state is aware of the current viewed profile
1-3, Added add friend button wich is hidden ATM
Merge branch '1-3' into dev
Merge remote-tracking branch 'origin/dev-2-1' into dev

Conflicts:
	www/templates/event.html
	www/templates/event/list.html
Fixed api login result
Fixed auth and user api
Merge branch '1-3' into dev
Merge remote-tracking branch 'origin/1-2' into dev

Conflicts:
	www/js/profile.js
Merge remote-tracking branch 'origin/dev-2-1' into dev

Conflicts:
	www/templates/event.html
	www/templates/event/list.html
Merge branch 'dev-2-1' into dev