changes before merge with michael's dev branch. Dec 12/13
Merge branch 'dev' of git://github.com/hnatiwm4/Alberta_Historical_Cemeteries_dev into dev

"Merge two dev branches"
Dec 12 merge