User module in process
Fixed Image service bugs
Merge branch 'user' of https://github.com/pi-engine/pi into user
User module in process
User module in process
Fixed Image service bugs
Merge pull request #214 from liuchuangww/user

User module in process
User module in process
Merge pull request #215 from liuchuangww/user

User module in process
Removed extra watermark image
Added support for watermark position
Fix front page and add admin user manage
Merge pull request #217 from liuchuangww/user

Fix front page and add admin user manage
Merge remote-tracking branch 'upstream/user' into user
User module compound edit page