Comment date stamps now display correctly, fix for issue #108
refactored pins as per #101, in preparation for the next API release (@EJEHardenberg)
Merge branch 'develop' of https://github.com/EJEHardenberg/GreenUp into develop
Replaced dev bottom_menu with android bottom_menu

Replaced the develop branches version of the bottom menu svg with the
one from the android branch because I know it renders nicely.
Merge branch 'develop' into android
Regenerated images

Regenerated images from svgs in order to have the bottom_menu image be
updated
Merge branch 'release/greenup_api_3' into develop
Merge branch 'develop' of github.com:EJEHardenberg/GreenUp into develop
Compatibility fixes to APIServerInterface in response to issue #101
added svg
added .DS_Store to gitignore
removed .DS_Store
removed conflict
fixed svg conflict
Merge branch 'android' of github.com:EJEHardenberg/GreenUp into android

Conflicts:
	android/src/com/xenon/greenup/MainActivity.java

resolved conflicts.
Merge branch 'android' of github.com:EJEHardenberg/GreenUp into android
Updated debug endpoint to fit to spec

Realized that the debug endpoint wasn't following everything in the spec
and it had slipped by not adhering to spec.
Merge branch 'android' into develop
Trying to fix the debug endpoint

The debug endpoint suddenly started 404-ing for any request.
Merge branch 'hotfix/pathing-debug' into develop

Conflicts:
	index.yaml