commit24
commit99
Merge branch 'master' of https://github.com/morgante/landmarkr

Conflicts:
	public/js/main.js
	public/js/mapper.js
commit98
Merge branch 'master' of https://github.com/morgante/landmarkr

Conflicts:
	public/js/main.js
commit97
Merge branch 'master' of https://github.com/morgante/landmarkr