ConfigurationController refactored, delete method is implemented.
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/src/main/java/com/devicehive/controller/ConfigurationController.java