Changes to be committed:
	modified:   models/post.go
	renamed:    models/post.go -> models/query.go
	modified:   models/utils.go
Merge branch 'master' of https://github.com/smtc/justcms

Conflicts:
	models/post.go
	models/utils.go