Merge branch 'develop' into develop-berend

Conflicts:
lib/core/User.class.php