Bug fixes
Merge branch 'develop' of https://github.com/ibikecph/ibikecphsite into develop