some changes to style.css
resolved main.js conflict!
Merge remote-tracking branch 'origin/radu.moldovan/slideView'
toolbar view update
fix
Merge branch 'toolbarv1.3'
cosmin
cosmin
conflict fix
conflict fix
add order.js
add order.js
bug fix
Merge remote-tracking branch 'origin/alexandra.vilcan/sidebarViewv1.0'
changes to appViewTemplate.js and style.css
Fixed text problem
cosmin
cosmin
changes to style.css slideView.js
conflict fix