modified
Merge branch 'master' of https://github.com/spinner-dev/ptemplate

Conflicts:
	static/css/custom.min.css
Merge branch 'master' of https://github.com/spinner-dev/ptemplate

Conflicts:
	static/css/custom.min.css
Merge branch 'master' of https://github.com/spinner-dev/ptemplate

Conflicts:
	static/css/custom.min.css