.
Merge branch 'master' of https://github.com/rogerein/lumishop

Conflicts:
	.gitignore