replace Long by long.
Merge remote-tracking branch 'origin/master' into iteration_1.0

Conflicts:
	src/main/java/com/horasphere/shiftsolution/interfaces/facade/dto/EmployeeDTO.java