Remove merge files
Merge branch 'master' of github.com:callista-software/apigw