working on persistant filter to lists
fixing merge conflicts
Merge branch 'master' of https://github.com/kbrougham/Pomometer
Reports and milestones converted to div