Rewrite models and create seed data
started controller
some new routes started
re-track db seeds
merge conflict, reindent
map template
Merge branch 'master' into map