Merge branch 'hotfix-removewishlistmsg'
removed duplicate files
reverted commit 6-17 before rebase
reverted commit 6-14 before rebase
Merge branch 'master' of github.com:eiNetwork/eiNetwork2
slider update
fix conflicts