updated gitignore
Merge branch 'develop' of github.com-kkemple:kkemple/meancommerce into develop
pulled in config_model changes from origin
Conflicts:
	.gitignore