add some UI and restructure DB
fix db
add ability to change password
add elements to contracts tab + many fixes
add ability to add/remove options
add admin view
add something fix something
Merge branch 'master' of https://github.com/ilya-murzinov/ecare-app

Conflicts:
	.idea/dataSources.xml
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/dao/OptionDAO.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/dao/OptionDAOImpl.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/dao/UserDAO.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/dao/UserDAOImpl.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/domain/Client.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/domain/Contract.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/domain/Option.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/domain/Tariff.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/domain/User.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/service/OptionService.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/service/OptionServiceImpl.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/service/TariffService.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/service/TariffServiceImpl.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/service/UserService.java
	ecare-app-data/src/main/java/com/github/ilyamurzinov/ecareapp/data/service/UserServiceImpl.java
	ecare-app-data/src/test/java/com/github/ilyamurzinov/ecareapp/data/ClientServiceTest.java
	ecare-app-data/src/test/java/com/github/ilyamurzinov/ecareapp/data/ContractServiceTest.java
	ecare-app-data/src/test/java/com/github/ilyamurzinov/ecareapp/data/TariffServiceTest.java
	ecare-app-desktop-client/src/main/java/com/github/ilyamurzinov/ecareapp/desktopclient/service/ClientService.java
	ecare-app-desktop-client/src/main/java/com/github/ilyamurzinov/ecareapp/desktopclient/service/ClientServiceImpl.java
	ecare-app-desktop-client/src/main/java/com/github/ilyamurzinov/ecareapp/desktopclient/service/ContractService.java
	ecare-app-desktop-client/src/main/java/com/github/ilyamurzinov/ecareapp/desktopclient/service/OptionService.java
	ecare-app-desktop-client/src/main/java/com/github/ilyamurzinov/ecareapp/desktopclient/service/TariffService.java
	ecare-app-desktop-client/src/main/java/com/github/ilyamurzinov/ecareapp/desktopclient/view/DialogView.java
	ecare-app-desktop-server/src/main/java/com/github/ilyamurzinov/ecareapp/desktopserver/Server.java