-page control bug
-reset filter function
-some bugfix
-other things =)
Merge remote-tracking branch 'origin/master'