BS3 pagaination update
Merge pull request #757 from sexnothing/develop

BS3 pagaination update