admin style updated
activeadmin logoutpath fixed
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4 into activeadmin
image uploader update
update to master
remove partners link from footer
merged remote master
Factor social media links into partials
Fix weird div nesting on location show page
turbolink gone and map loading
Merge branch 'master' into erb-fix
Merge branch 'master' into erb-fix
Merge pull request #30 from TIYA-Durham-GDI/erb-fix

Erb fix
Merged master; turbolinks removed and erb nesting problem solved
Keep fixing weird div situation
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into erb-fix
Merge pull request #31 from TIYA-Durham-GDI/erb-fix

Erb fix
minor changes to class names
merged master
Merge branch 'master' into activeadmin