Merge branch 'release/greenupapi_2' into develop
Merge branch 'master' into develop
Ignored android and ios folders for uploads.
Bumped GreenUp Version number
Merge branch 'hotfix/greenupapp_version' into develop
API version for gae to 1
Merge remote-tracking branch 'origin/android' into android
Updated bottom_menu.svg

Fixed bottom_menu svg to not have random extra space or teal side
panels. Regenerated images that use the bottom_menu pngs
Merge remote-tracking branch 'origin/android' into android
Added hamburger icon and top bar

Added hamburger svg (might need work) and top bar (should be fine).
Generated images for them by modification of create_images script
Merge remote-tracking branch 'origin/android' into android
Made APIServerInterface static and removed some unused imports
Added POST for pins
Added ID to layout for feed

Added id so that we can use it to in findViewById()
Got a basic text input on.

Working on #93

Got a EditText appearing after fiddling with the size of the list view.
Which was taking up the whole page. I don't know if the current values
being set through the graphical designer in Eclipse are good. There
might be a better way to set the properties so they're not fixed at some
dp size.
Merge branch 'android' of github.com:EJEHardenberg/GreenUp into android
did some heat map work
Merge branch 'develop' into ios_anders
well FSNetworking ing has basically reached the end of its life with me... f
Merge remote-tracking branch 'origin/android' into android