Changes made by Glen Souza (glenster75@gmail.com).
Merge branch 'master' of https://github.com/glenster75/SmartCondo-Prototype.git
Changes made by Glen Souza (glenster75@gmail.com).