Use slug, not id, in map popup links
Merge pull request #16 from Skud/maplink

Use slug, not id, in map popup links
Added map to site detail page
Merge pull request #17 from Skud/site-detail-map

Added map to site detail page
removed old site detail javascript
Merge pull request #18 from Skud/site-detail-map

removed old site detail javascript
Avoid conflicts between similar bits of map javascript
Merge pull request #19 from Skud/site-detail-map

Avoid conflicts between similar bits of map javascript
added debug messages to site detail map
added more debug messages to site detail map
Tweaking javascript to try and figure out bugs
Another shot at fixing the map javascript
Bugfix for password reset token
Merge pull request #21 from Skud/passwordreset

Bugfix for password reset token
Merge pull request #20 from Skud/site-detail-map

Site detail map
Fix redirect oddness after resetting password
Merge pull request #22 from Skud/passwordreset

Fix redirect oddness after resetting password
css styling
updated branding
Merge https://github.com/bashton37/3000acres into branding

Conflicts:
	app/controllers/application_controller.rb
	app/views/devise/mailer/reset_password_instructions.html.haml