Merge remote-tracking branch 'nejdet/development' into development
Merge remote-tracking branch 'origin/front-end' into front-end
fixed new dirs for jquery bootstrap