resolved issue_34[Add admin interface to manage & configure product type components and rules T:14h00]
Merge branch 'test_outstanding_pull_requests' into Add_admin_interface_to_manage_and_configure_product_type_components_and_rules_#34

Conflicts:
	liquibase/db-changelog.xml
	src/controller/AdminController.java