added map picker
Merge branch 'master' of github.com:danpalmer/adventure-timeline

Conflicts:
	static/at.js
merge!