Merge branch 'master' into unstable
error handling on the way
Deal with exceptions in security code &&

Merge branch 'master' into unstable

Conflicts:
	server/src/main/java/com/kylinolap/rest/service/UserService.java
Merge branch 'unstable' of https://github.com/KylinOLAP/Kylin into unstable