Replace bitcointip with ChangeTip
Merge branch 'develop'