Merge pull request #2 from Geodan/master

pull request 20140225
diff text
Merge branch 'master' of https://github.com/MartijnHeuff/icm-ui

Conflicts:
	index.html
	src/beeldCtrl.js
	templates/beeld.html
test
newline
content without diff information for editing
css red
Merge branch 'master' of https://github.com/Geodan/icm-ui

Conflicts:
	css/app.css
	src/beeldCtrl.js
	templates/beeld.html