Merge pull request #18 from cenderin/master

changed some stuff in controller, also changed date picker css
got 3 tests to work
fix