Version update
Merge branch 'master' of https://github.com/wolffe/LifeMap

Conflicts:
	config.xml
	index.html