Add update.sh script
Installation of FOS User
Fix conflicts
Add test
clean up