Added notes when article image is uploading
Fixed bug article with slug cannot be previewed
Fix for page route
Merge branch 'develop' of https://github.com/pi-engine/pi into develop
Fixed bug of article permission
Merge pull request #1000 from sexnothing/develop

Page module update
Merge branch 'develop' of https://github.com/pi-engine/pi into develop

Conflicts:
	usr/module/page/template/admin/page-list.phtml
Merge pull request #999 from linzongshu/develop

Added notes when article image is uploading
Fixes #404: set user gender default as `unknown`
Grunt config update