Dev commit
Merge branch 'master' into bin-editing
Updated dependencies
Dev commit
Merge branch 'master' into bin-editing

Conflicts:
	src/main/java/uk/ac/cam/sup/controllers/BinEditor.java
Fixed some java code
Added permissions to the edit
Fixed a bug with deleting elements
Work on the editing view
Merge branch 'master' into bin-editing

Conflicts:
	pom.xml
Fixing bugs with the general editor