filter UI
adjust filter table
added query for day and area
resolve develop
correct tracking
tracking..
stop tracking project folder
stop tracking project folder
resolve conflict