warehouse rest project added
gitignore fixed
removed netbeans artefacts
warehouse-ws-alt module added
warehouse-ws-api module added
rest controllers added
Merge branch 'master' into 5thWeekNikolay

Conflicts:
	warehouse_alternative/warehouse-integration-tests_alt/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
	warehouse_alternative/warehouse-integration-tests_alt/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/TEST-lv.javaguru.ee.warehouse.core.SpringContextTest.xml
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/TEST-lv.javaguru.ee.warehouse.core.database.audit.ClientAuditTest.xml
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/TEST-lv.javaguru.ee.warehouse.core.database.hibernate.OrderDAOImplTest.xml
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/TEST-lv.javaguru.ee.warehouse.core.database.hibernate.ProductDAOImplTest.xml
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/TEST-lv.javaguru.ee.warehouse.core.database.hibernate.ProductPropertiesDAOImplTest.xml
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/TEST-lv.javaguru.ee.warehouse.core.database.hibernate.WarehouseDAOImplTest.xml
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/lv.javaguru.ee.warehouse.core.SpringContextTest.txt
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/lv.javaguru.ee.warehouse.core.database.audit.ClientAuditTest.txt
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/lv.javaguru.ee.warehouse.core.database.hibernate.OrderDAOImplTest.txt
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/lv.javaguru.ee.warehouse.core.database.hibernate.ProductDAOImplTest.txt
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/lv.javaguru.ee.warehouse.core.database.hibernate.ProductPropertiesDAOImplTest.txt
	warehouse_alternative/warehouse-integration-tests_alt/target/surefire-reports/lv.javaguru.ee.warehouse.core.database.hibernate.WarehouseDAOImplTest.txt
	warehouse_alternative/warehouse_alt/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
	warehouse_alternative/warehouse_alt/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
	warehouse_alternative/warehouse_alt/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
IDEA