merge with dev
ticket changes
add buttons
change calendar css
Merge pull request #35 from vatseek/development

add design changes