merges, dashboardifies

merges latest master into dashboardify, creates controller/view for dashboard