fixed model and added pagination
Merge branch 'master' of github.com:R3dTeam/lapse-angular