merging stuff
Merge branch 'awesome-time'

* awesome-time:
  Save tags when creating new activity
adding new activities WORKSg add -A