Merge branch 'master' of https://github.com/itravel/admin.git

Conflicts:
	admin/web/src/main/webapp/sb-admin/js/flot/jquery.flot.js
Merge branch 'master' of https://github.com/itravel/admin.git