Auth cleanup
Merge branch 'formlayout' of https://github.com/libris/kitin into formlayout