flash can be closed now, some cleanup
Primary project CUD feature. for issue #169
Merge branch 'master' into admin