Merge branch 'master' of git@github.com:simonkrenger/ch.bfh.bti7054.w2013.q.webshop.git into fraenzi-branch
Merge branch 'master' of git@github.com:simonkrenger/ch.bfh.bti7054.w2013.q.webshop.git into fraenzi-branch
merge commit
Merge remote-tracking branch 'origin/fraenzi-branch' into simon-branch