Additional tweaks to resolve bootstrap3dave and newui branch merge, preventing bootstrap script conflicts, moving several .less files into the /less folders and refing them for auto-compilation