new file:   css/datepicker.css
	new file:   js/bootstrap-datepicker.js
	new file:   js/confirmDate.js
	modified:   js/newEmployee.js
	new file:   less/datepicker.less
	modified:   templates/addRemoveDate.html
	modified:   backend.html
	modified:   js/Classes/Project.js
	modified:   js/main.js
	deleted:    js/popoverForEmployee.js
	modified:   js/vlad.js
	modified:   server/controllers/postReqController.js
	modified:   server/controllers/queryController.js
	modified:   server/db/dataSetter.js
Merge branch 'develop' of https://github.com/glebovilya/CBoard into iss24

Conflicts:
	js/main.js

	modified:   index.html
	modified:   js/main.js
	modified:   index.html
	modified:   js/main.js
	modified:   js/stepa.js
	modified:   js/main.js
Merge branch 'iss24' into develop

Conflicts:
	js/main.js

	new file:   css/datepicker.css