upraveny nazvy bo a servisu a nazvy tabulek
Merge branch 'master' of github.com:usi-skladovy-system/a7b36usi-skladovy-system
Merge remote-tracking branch 'origin/zkouskaControleru'

Conflicts:
	source/src/main/java/cz/a7b36usi/sklad/BO/ArticleBO.java
	source/src/main/java/cz/a7b36usi/sklad/BO/MovementBO.java
	source/src/main/java/cz/a7b36usi/sklad/BO/OrderBO.java
	source/src/main/java/cz/a7b36usi/sklad/BO/ProductBO.java
	source/src/main/java/cz/a7b36usi/sklad/Controller/TabController.java
	source/src/main/java/cz/a7b36usi/sklad/Controller/states/AddressBook/AddressBookState.java
Merge
Merge remote-tracking branch 'origin/master' into zkouskaControleru