Ignoring .idea\ folder, as it is user specific
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Renamed GroupedAbsencesBuilder to GroupedAbsenceBuilder