ready for heroku
updated admin dash added dashboard controller
resolved conflicts