service web auth (in progress)
Merge branch 'master' into ice-cream-sandwich
misc fixes
Merge branch 'master' into ice-cream-sandwich
notification text from resources
Merge branch 'master' into ice-cream-sandwich
fixed web authorisation behaviour (added missed cookie db initialization)
Merge branch 'master' into ice-cream-sandwich