Singapore updates
Merge branch 'develop' of github.com:youngrewiredstate/pyrosite into develop