sqlite and development log to Merge
logdevelopment to merge admin-side-task to master