fixed time error
Merge branch 'master' into front_end

Conflicts:
	pages/js/main.js
fixed text history vert-size, left/right text added and styled, drawer styled & js done
Merge branch 'front_end'