final changes
Merge branch 'master' of https://github.com/plutoless/plutoless-studio

Conflicts:
	public/js/index.js
	public/js/post.js