merge apps into one
merge branch 'chdoig/dashboard' merge apps into one