Payments
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/java/com/nfc/app/Application.java
Set up for running web Site
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/java/com/nfc/app/Application.java
	src/main/java/com/nfc/app/context/RepositoryConfig.java
	src/main/java/com/nfc/app/controller/ClientController.java
	src/main/java/com/nfc/app/controller/OrdersController.java
	src/main/java/com/nfc/app/model/database/Clients.java
	src/main/java/com/nfc/app/model/database/Order.java
	src/main/java/com/nfc/app/model/database/OrdersPerItem.java
	src/main/java/com/nfc/app/model/database/Table.java
	src/main/java/com/nfc/app/model/rest/ItemRest.java
	src/main/java/com/nfc/app/service/OrderService.java
	src/main/java/com/nfc/app/service/iml/OrderServiceImpl.java