Moved datepickers into menu bar
small style changes
Merge branch 'develop' of https://github.com/avalanchedotca/CACMobile into develop