working on the dashboard
Merge branch 'front-end' into design
finished dashboard (for now)
added coordinate functionality to models
hasboard route passes activities and messages
added Message model to users route
Merge branch 'master' into front-end
got activities on dashboard working
merging
fix merge conflicts
merge with design