fixing backend's layout
Merge remote-tracking branch 'origin/master'
Frontend support for Bootstrap 3