changed Honbu url to a sub-domain based one
changed Honbu URL
reverting file to pre-conflict state
Merge pull request #816 from 56yards/master

Fixed previous merge conflict