Improvements
Improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/sqldialects.xml
	.idea/workspace.xml
	app/styles/style.scss
	wp-content/themes/zts/index.php
	wp-content/themes/zts/style.css
	wp-content/themes/zts/style.css.map