oops
Merge branch 'master' of github.com:migurski/paperwalking

Conflicts:
	decoder/decode2.py
	site/lib/data.php
	site/templates/about.html.tpl
	site/templates/compose.html.tpl
	site/templates/footer.htmlf.tpl
	site/templates/index.html.tpl
	site/templates/language.html.tpl
	site/templates/navigation.htmlf.tpl
	site/templates/print.html.tpl
	site/templates/prints.html.tpl
	site/templates/scan-large.html.tpl
	site/templates/scan.html.tpl
	site/templates/scans.html.tpl
	site/templates/unavailable.html.tpl
	site/templates/upload.html.tpl
	site/templates/uploaded.html.tpl
Adding aspect ratio selection; adding ability to deal with arbitrary number of incidents
Adding new stylesheet for csv demo
Cleaning up stylesheet
Setting map extent based on multiple locations from uploaded data
Adding Landscape orientation for map pages; saving pertinent data for the server; correctly updating map extent with a callback
Adding Landscape orientation for map pages; saving pertinent data for the server; correctly updating map extent with a callback
Merge branch 'atlas-ui-sketch' of github.com:stamen/paperwalking into atlas-ui-sketch
Redid field papers grid: using rectangles instead of horizontal and vertical lines; added labels to each cell in the grid; reverted to old method of hit testing; added ability to update aspect ratio; now using latest version of paperjs
Adding preliminary map paint example for Field Papers UI
Fixed bug in MouseUp handler; added zoom buttons; stubbed out path scaling upon change in zoom level
Fixed bug in drag handler; added function to scale paths between zoom levels
Fixed scaling problem for paths: after zoom level changes, paths are scaled correctly and retain geographic location; added a move button to the toolbar
Fixed path dragging bug
Uncommented out the path dragging bug fix
Added path translation function: paths keep geographic position while the map is panned; stubbed out functions to add atlases based on drawn paths; removed move button; added cursors to indicate path movement
Cleaning up; adding stylesheet
Created www/compose-print-old.php to let old-style composition continue working
Stubbed-out compose_from_postvars()