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