synching
Merge branch 'master' of https://github.com/veev/jrh

Conflicts:
	JRHMemorialWall/bin/data/gui_settings.xml