fixed cache during front enditing
fixed sidebar layout
fixed cache during front enditing
Merge remote-tracking branch 'origin/1.0'