start tests/factories
fix merge conflict
remove create activity link
add 404 redirect to place/trail show/edit pages
adjust info window on map, make parking and bin markers solid
started accounts testing
commentify gmaps.js.coffee
add tests for accounts api controller
add tests for car parks api controller
add rough logo/fix signed in card/fix activities in accounts
continue tests/minor fixes/add date to places
add finished graphic work/continue tests
trails/users controller tests added
model tests
add admin controllers
start email previews/minor fixes to admin section'
add emails