"Administrator" role renamed to "ADMIN"
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/devicehive/controller/DeviceController.java
Build Fix