PIM-2165: Remove useless app/entities directory
1.1.0 dev begins !
Update change log to prepare new entries
Add a branch alias for dev-master
PIM-2165: Update CHANGELOG with future release
Merge branch 'master' into PIM-2165

Conflicts:
	CHANGELOG.md
Merge pull request #821 from akeneo/PIM-2165

PIM-2165: Remove useless app/entities directory
Merge branch 'master' into PIM-2172
PIM-2172: Remove app/emails from .gitignore file
PIM-2172: Update CHANGELOG.md