Merge remote-tracking branch 'origin/master'

# Conflicts:
#	server/src/main/java/com/doumee/core/constants/Constants.java
#	server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java