first commit from my SAMSUNG
remove shop module
add gitignore
Merge pull request #26 from goFrendiAsgard/development

Merge from upstream