like changes in logbook
changes in admincontacts
model
conflict removed
Merge branch 'development'