CartItem_hozzaadas_modositva
logout view
Merge remote-tracking branch 'origin/master'
CartItem_hozzaadas_modositva
CartItem_hozzaadas_modositva
Merge remote-tracking branch 'origin/Krisz'
Merge branch 'master' into Krisz

Conflicts:
	app/controllers/Orders.java
bugfix
Merge remote-tracking branch 'origin/master' into Krisz
bootstraps