GUI
Merge branch 'master' of https://github.com/vkcelik/webshopbackend.git

Conflicts:
	programbackend/src/data/dao/MySQLBynavnDAO.java
	programbackend/src/test/TestBynavn.java