more faffing about
Merge branch 'master' into dev
still looking for extra layers
Merge branch 'master' into dev
added basic upload of marker info (stripped out file uploads for now)
a little accordion to make things easier to read on a phone
Merge branch 'dev' of https://github.com/faulteh/tiger-govhack into dev