Merge branch 'develop' of https://github.com/TRashid/bitstarter
Merge branch 'staging'