Fixes #131 Tour hints added
refs #131; merged current integration branch
refs #131; fixes some formatting issues; changes edit tour hints to
checkboxes
fixes #131; merged development branch into integration