Merge remote-tracking branch 'origin/pagination' into erik
Merge branch 'master' into erik
Updates global library template to use Bootstrap elements, updates User model to contain a 'name' column
Merge commit