commit koa
Merge branch 'koa-develop' of https://github.com/Nightink/node-Pophoto into koa-develop

Conflicts:
	controllers/user.js