Merge develop into master before merging into inbound-pro

[DavidWells]

There are files in inbound-pro/core/inbound-mailer that do not exist here on the master branch.

Before merging anything into the inbound-pro repo. Make sure you are merging the correct files @atwellpub @daprela

Master branches should be the clean working code of the repo that is safe to merge into inbound-pro core. Any other branch shouldn't get merged over to another repo.

The Flow should be:

Merge whatever branch you are working on into this repo's master -> then you can sync that master code into inbound-pro

[atwellpub]

@DavidWells

David ignore the master until we perform a stable release and only work in develop like Giulio and I do.

Our dev flow looks like this:

• make changes in dev and push to dev
• make larger feature changes in feature branch and merge into dev when complete
• when official release merge dev into master and tag master

During development stages, in between releases, there is no reason to reside or work in the master branch.

In all core components we develop inside the develop branch except the templates repo, which does not have a dev/master branch... only a master branch.