Adding js-object merge method and a remove empty entities method
Merge branch 'master' into element_should_show

Conflicts:
	static/js/services/services.js
	templates/_media.html
Adding new material type record templates.
Added merge record with record template and fixed problems in clean record.
Started to fix initial empty field show/hide in gui templates
Merge branch 'element_should_show'

Conflicts:
	templates/_media.html