Merge pull request #3 from Geodan/master

pull request 20140227
Merge pull request #4 from Geodan/master

pull request 20140304
diff met textAngular en FontAwesome
Merge pull request #52 from MartijnHeuff/master

Diff, inclusief gebruik van textAngular en Font Awesome
Merge branch 'master' of https://github.com/Geodan/icm-ui

Conflicts:
	templates/beeld.html
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui