Develop

Merging date parsing code to qa