changed favicon. Should be changed to a better pic soon
Started on relation window and extra attributes
Merge remote-tracking branch 'origin/master' into RelationAndSOP

Conflicts:
	gui/web/app/index.html
	gui/web/app/views/attrgrid.html
Changes attributes grid. Now we need to fix contextmenues etc
Merge remote-tracking branch 'origin/RelationAndSOP' into sopmaker

Conflicts:
	gui/web/app/index.html
	gui/web/app/scripts/directives/attrcontextmenu.js
	gui/web/app/scripts/directives/attrgrid.js
	gui/web/app/scripts/directives/conditions.js
	gui/web/app/views/attrgrid.html
	gui/web/app/views/conditions.html
	gui/web/app/views/header.html
	gui/web/app/views/itemtable.html
Fix of attributes view