Added Spring and refactorted
Merge branch 'paging'