Client reorder
Merge branch 'master' into dev_t
HTML5 boilerplate works
HTML5 boilerplate works