Start of iteration 3.
Bump version number

Also re-enables clickable markers
Merge branch 'develop'