Merge branch 'development' of https://github.com/RichmondDay/www.mini.ca into mobile
Merged back into mobile branch
Fixed conflict