changes done in userblogs and logbooks
conflict removed frm schema, usercontroller
Merge branch 'development'