Edit hosts/development to default
Merge remote-tracking branch 'origin/master'