merged in frontend work
Merge branch 'development' into frontend
added dashboard
implementing dashboard view
further fleshed views
fixed merge
added simple form to edit