Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java