starting #416 font-icon embedding for object types
Merge branch '80-244-297-369-refactor-of-relations-manager' of https://github.com/bedita/bedita into 80-244-297-369-refactor-of-relations-manager
Merge branch '80-244-297-369-refactor-of-relations-manager' of https://github.com/bedita/bedita into 80-244-297-369-refactor-of-relations-manager
Merge branch '80-244-297-369-refactor-of-relations-manager' of https://github.com/bedita/bedita into 80-244-297-369-refactor-of-relations-manager

Conflicts:
	bedita-app/views/layouts/default.tpl
	bedita-app/webroot/css/bedita.css