Merge pull request #190 from aztec8/master

Software Freedom Day tweaks
Merge pull request #191 from aztec8/master

new apk - still needs some tweaks. stand-by
Merge pull request #195 from aztec8/master

new apk, pointing to yellrdev
debug stuff
fixed issue with extention not being correct
Merge pull request #197 from aztec8/master

app can now upload and post images
some changes from tuesday at WXXI
Merge branch 'master' of https://github.com/hhroc/yellr
about to merge with aztec8/yellr
Merge https://github.com/aztec8/yellr

Conflicts:
	src/server/yellr-serv/yellrserv/client_views.py
Merge https://github.com/aztec8/yellr
Merge https://github.com/aztec8/yellr
Merge pull request #215 from aztec8/master

the latest things from last week
removed debug output from prompt
Merge branch 'master' of https://github.com/hhroc/yellr
removed some debug stuff
Merge pull request #221 from aztec8/master

october hackathon start
Merge pull request #229 from aztec8/master

stuff to update yellrdev
Merge pull request #231 from aztec8/master

stories are back on track
added to test geo fencing functions