Added display but not yet compose support for Bing tiles
Merge branch 'master' of git://github.com/migurski/paperwalking

Conflicts:
	decoder/compose.py
fixing merge problems hopefully
Fixing tabs
new German translation for atlas pages
Scan decoding queue messages are now complete JSON
Failing scan completely on first QR code problem, and storing extra information from SIFT in scans table
Successfully used manual intervention with a single scan to recover decoding flow from a typed-in print URL in place of the QR code
Added QR code recovery form to all languages, though in English for now
Finished English version of QR code recovery form
Merge branch 'master' of https://github.com/John07/paperwalking into german-merge
Just detecting image blobs so far without model comparisons
Experimenting with numpy for iterating over inter-blob triangle features
Working on angles
Redefined meaning of diatance ratios somewhat
Wrapped blob extraction into imgblobs() and included some assumptions about the blob sizes we want.
Started moving triangle-features.py code to featuremath module
Finishing moving logic from triangle-features.py to functions in module featuremath
Trying to cut down on the size of potential comparison universe early
Seemingly have gotten this new generator function working