After merge
Merge branch 'master' of github.com:maykinmedia/bluebottle
Removed obsolete files
Merge remote-tracking branch 'origin/master'