Merge branch 'develop' into adminDash3
new backup branch in prep for release
styling dash
attemped to oppt add precision
Merge branch 'ios_beforePresentation' of https://github.com/EJEHardenberg/GreenUp into ios_beforePresentation
fixed project errors
Merge branch 'ios_beforePresentation' of https://github.com/EJEHardenberg/GreenUp into ios_beforePresentation
added view region optimization for heat map
Merge branch 'ios_beforePresentation' of https://github.com/EJEHardenberg/GreenUp into ios_beforePresentation
added markers
added new icon for user pins, and updated post and cancel button for posting user pins
Updated Readme with specifications for #138

While feature request #138 was implemented, the documentation was never
updated it seems. This commit fixes that.
Updated API spec for markdown

The API spec rendered fine on github flavored markdown renderers, but
plain markdown renderers didn't like the code formatting for the example
responses.

They've been fixed.
Initial commit
Ethan use this branch and commit for the repo migration
Removed Web Files from GreenUp Repository

Code CleanUp. Moved Web files to the root and removed the other code.
Instead of just making a new repository we are keeping the commit
history then just removing unneccesary pieces and funneling them where
they need to go.
Dash Auth simple-auth PHP Libs added
Merge branch 'master' of github.com:EJEHardenberg/green-web

Conflicts:
	README.md
Removed non-app specification code
Merge branch 'ios_beforePresentation' of github.com:EJEHardenberg/GreenUp into ios_beforePresentation