Modify Spring controller handling
Add pagination to UI part
Merge remote-tracking branch 'origin/master'