tweak;
tweak
tweak
tweak
Merge remote-tracking branch 'upstream/master'

Signed-off-by: linkarys <linkarys@gmail.com>

Conflicts:
	app/scripts/services/authservice.js
deal with conflict

Signed-off-by: linkarys <linkarys@gmail.com>
update user info and privilege filter