Merge pull request #24 from janaspage/master

Merging in photo-uploader contained in toolbox.
really fixed upload
limit db
limit db bugfix
limit db bugfix
whoopsie, worked on master
gotta merge
Merge branch 'master' into search
New nav bar buttons
Merge pull request #28 from tcb-hr/panels

New nav bar buttons
Handles addresses with cross streets
Merge pull request #29 from tcb-hr/crossStreets

Handles addresses with cross streets
need to test oatuh
Merge branch 'master' of https://github.com/tcb-hr/feed into search
Merge pull request #30 from tcb-hr/search

Search
fixed for demo
Merge pull request #31 from tcb-hr/search

fixed for demo
i wanna test master and there were uncommitted changes
deleted uploaded pic blobs
dns ip