BS3 front update
Merge pull request #752 from sexnothing/develop

BS3 front update