Billy Everyteen Merge branch 'develop'

Latest commit a16d9f2

Nov 1, 2016