merged with develop added new build
added set/remove css class for sidebar
merged with origin added new build