Clean project
move database in app documnet
Merge branch 'feature' into development