Merge pull request #192 from stvno/master

connection status stuff
Merge pull request #46 from Geodan/master

merge from origin
More on syncprogress
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui

Conflicts:
	lib/cow
Merge pull request #193 from tomvantilburg/master

merge from Tom
Merge pull request #19 from Geodan/master

pull request 20140325
Removed some icons
Fixed #187
#114    automatic increase size of Messagebox with typing
Merge pull request #196 from MartijnHeuff/master

#114 autoexpand messagebox with library/directive
comment
Merge pull request #47 from Geodan/master

merge from origin
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui
Merge pull request #198 from tomvantilburg/master

some config
#195 reset isEdit on first show, edited text is not shown in other incidents
Merge pull request #199 from MartijnHeuff/master

#195 reset isEdit on first show
Merge pull request #27 from Geodan/master

main merge