US507 Fixing some stuff with messages and shelving work
US507 Date stuff
US507 Finishing tests using testCase1 csv file
Merge branch 'development' into dev-with-previewstuff