date problem fixed
Merge branch 'devel' into date_fix