Merge branch 'master' into pbetav1
add views of Membermanage
Merge branch 'pbetav1' of github.com:skymoney/SkyMeeting into pbetav1