done date selection in tabs
fixed the conflict for css
Merge branch 'decatan-master'

manged to save the errors
insert