Merge branch 'hotfix' into dev
Merge branch 'dev' of github.com:ubc/iPeer into dev