Merge pull request #546 from jonezy/development

some fixes brought in from the release branch.
Merge branch 'development' of github.com:RichmondDay/www.mini.ca into development