In sync
Merge branch 'master' of https://github.com/hatemalimam/DailyLab

Conflicts:
	target/classes/com/ha/dailylab/PickListConverter.class