minor
Merge branch 'master' of https://github.com/orachid/yacramanager.git

Conflicts:
	src/main/java/fr/wati/yacramanager/listeners/ActivityEvent.java
	src/main/webapp/assets/css/app.css
	src/main/webapp/assets/js/app/controllers/company-controller.js
	src/main/webapp/views/app/company/employees/company-employees-overview.html