work on criteria bar
Merge branch 'master' of https://github.com/orachid/yacramanager.git

Conflicts:
	src/main/webapp/assets/css/angular-criterias.css
	src/main/webapp/assets/js/app/controllers/absences-controller.js
	src/main/webapp/assets/js/app/directives/angular-criterias.js
	src/main/webapp/assets/others/criteria/criteria-checkbox.tpl.html
	src/main/webapp/assets/others/criteria/criteria-text.tpl.html
	src/main/webapp/views/app/absences.html