BS3 update
User module bug fixed
Merge pull request #767 from sexnothing/develop

BS3 update