new
res conf
Merge branch 'master' of https://github.com/xottabut/InternetProviderWind

Conflicts:

	InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/implementations/admindashboard/RegisterEngineer.java