Fix classpath for master branch
Design Filter Buttons
Merge remote-tracking branch 'whatsToDo/master'
Fixinf the branch mess...