Git keep packaging and packages folders
Merge remote-tracking branch 'origin/develop' into developbueno

Conflicts:
	.gitignore
Merge pull request #184 from javigomez/gitkeep

Gitkeep packaging and packages folders