undiscarded files
some trash
got back annotations to classes
added dependencies for classes
no message
Merge branch 'dev' of https://github.com/ArtyomShaitor/OnlineShopEricpol into dev

Conflicts:
	.idea/workspace.xml
	target/classes/com/onlineshop/classes/admins.class
	target/classes/com/onlineshop/controllers/MainController.class
	target/maven-archiver/pom.properties
	target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
	target/onlineShop.war
	target/onlineShop/WEB-INF/classes/com/onlineshop/classes/admins.class
	target/onlineShop/WEB-INF/classes/com/onlineshop/controllers/MainController.class
	target/onlineShop/res/stylesheet.css