Merge pull request #24 from Geodan/master

laatste versie van main
Merge pull request #25 from Geodan/master

laatste versie van main
header (bread crumbs) styling
Merge pull request #185 from tomvantilburg/master

merge from Tom
Merge pull request #186 from tomvantilburg/master

Working on sync progress indicator
Merge pull request #17 from Geodan/master

pull request 20140325
Merge pull request #190 from tomvantilburg/master

Nicer syncprogressbars
#184 links work in Beeld also if it they're just added
Merge pull request #18 from Geodan/master

pull request 20140325
Merge pull request #191 from MartijnHeuff/master

#184 add link-functionality to beeld
Reconnect logica toegevoegd
Merge pull request #26 from Geodan/master

laatste versie van main
More obvious disconnected state
Merge branch 'master' of github.com:stvno/icm-ui

Conflicts:
	templates/header.html
	templates/login.html
Merge pull request #192 from stvno/master

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

merge from origin