Merge branch 'master' into history
Merge branch 'history' of https://github.com/Alerion/shopping-helper into history
Merge branch 'history' of https://github.com/Alerion/shopping-helper into history
changed IDs in template changed update_timeline in views #3