tyring to get shop to not crash
Merge branch 'master' of https://github.com/pgerlich/conquestOnline
Merge branch 'master' of https://github.com/pgerlich/conquestOnline