- filter layout eddited
- bugfixing filter
- week number color edited
Merge origin/master