Merge branch 'hotfix/lat-lon-heatmap'
Fix #129

Pull develop and try it now @popwarfour
added intellij android studio to gitignore
adding skeleton classes for logging
Fix #129

The problem was that we're all morons. I've corrected this with a heavy
dose of sarcasm, hatred, and far too many cups of Tea. Enjoy.

Seriously though, there is no id! there is key() and there is the id()
of the key object. If we were in RoR then there would be an id, but
sadly that would make too much sense. Although, if we were in RoR then
we wouldn't be doing a raw json API server anyway, because that's not
what RoR is designed for and it doesn't play well with raw HTTP. Not too
mention it's got a bloated rendering and asset pipeline.

Anyway, my dayjob aside. This is the fix. We need to stop pretending
that the GAE makes any sense with it's ORM.
Merge branch 'develop' of https://github.com/EJEHardenberg/GreenUp into develop
added button toggle to start/stop
home button now changes text
renamed layout file
Merge branch 'joshDroid' into develop
Added shell methods and classes for permanent fix for issue #118
Set up overriding for default put() and delete() methods from db.Model to facilitate callbacks that auto-execute the entity counting we need to do
continuing work on entity counter for #118
added wrapper functions for increment/decrement. Passes spider for what it's worth, but still needs to have duplicate entity type bug worked out.
messing with mapLayout
bottom slide almost working
Committing this work, need some extra eyes on it. @EJEHardenberg can you take a look?
Work against #118 "2nd set of Eyes"

References #118 and #130

@the-hobbes
The monkey patching is cool, but is it neccesary? I've taken it out for
the same of clarity. (I'm sorry if you spent a lot of time on it, it is
very cool how it allowed us to not have to explicitly call anything --
really)

I'm calling the increment manually and it's giving me the right count
for all entities except the gridpoints. For some reason, the gridpoints
show up multiple times in the database and I'm not sure why. If you're
ok with us un-patching the datastore you can merge this commit in with:

    git fetch origin entityCounting
    git merge --no-ff FETCH_HEAD #I'm assuming you're on develop

And it should take. I think there might be more code I could take out,
as the 'after put' and 'before put' logging no longer appears now that
I've removed the patching.

If the monkey patching worked properly it'd definitely be the way to go
but the race condition and asynchronous code is definitely the problem I
think.
implemented map bounds, working
implemented map bounds, working