added User.Nick to ShiftEntries_by_shift function
change shift mail function
Merge branch 'master' of github.com:engelsystem/engelsystem

Conflicts:
	includes/model/ShiftEntry_model.php