User module front update
Merge remote-tracking branch 'upstream/develop' into develop
User module front bs3 update
User module bs3 update
Merge pull request #776 from sexnothing/develop

User module front update