change style to render better
fix validation error
fix missing parameter and prepare function issue
Merge branch 'tmp'
Merge branch 'master' into dev

Conflicts:
	css/templates/styles.css
	front/ws_tools.class.php