Slippy map now pulls from python http tilecache server which stores tiles in tilecache/public/images/tiles/
Merge branch 'master' of github.com:junosw/juno-public

Conflicts:
	slippy-map/app/views/main.scala.html