Minor update. And adding uninett bootstrap thee to dev app
Fix confliect when mering user