Merge branch 'inst-owncloud' into lassi
modify user status