add edit page,revise pagination
Merge branch 'master' of https://github.com/fwrq41251/playBlog.git

Conflicts:
	.target/controllers/Application.class
	.target/controllers/PostController$Post.class
	.target/controllers/PostController.class
	.target/global/Global.class
	.target/models/Article.class
	.target/models/ModelsTest.class
	.target/models/Users.class
	.target/service/ArticleService.class
	app/models/Users.java
	build.sbt
	conf/application.conf