added language support
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/index.php
propel, bootstrap, new layout
Merge branch 'master' of https://github.com/Enteee/ch.bfh.bti7054.w2014.p.webshop

Conflicts:
	src/index.php