LB-306 : Change names of users and live blog in default demo database
Merge remote-tracking branch 'sourcefabric/liveblog-13'
Merge remote-tracking branch 'sourcefabric/master' into devel
NR-953 : Aloha editor - fix toolbar

updated toolbar icons
Merge pull request #26 from gizm0bill/devel

NR-953 : Aloha editor - fix toolbar
CSS-weekly-update

LB-567, Live edit fix, media-archive update, desks update
Desk update
Merge pull request #27 from nidzix/css-weekly-update

Css weekly update