test
Merge branch 'refs/heads/kontem'
Changed navigation of shop.
Merge remote-tracking branch 'refs/remotes/origin/AnnBranch'
Merge remote-tracking branch 'refs/remotes/origin/master'
bug fix
Merge branch 'refs/heads/master' into kontem