Properties changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/styles.css.map
	css/styles.min.css
4 columns
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/styles.css.map
	css/styles.min.css