goldaan 4/27
Merge branch 'master' of github.com:srmo642002/Eshop

Conflicts:
	messageCodes