Everything that I have is now here
Merge remote-tracking branch 'origin/master'

* origin/master:
  Modified title
  Fixed layout stuff
  Fixing date picker and such