Merge pull request #756 from sexnothing/develop

User module bs3 update
Code cleaning up
BS3 pagaination update