Code cleaning up
Merge pull request #761 from sexnothing/develop

BS3 update
Code cleaning
User module front bs3 update