Update README.md
Squashed commit of the following:

commit 0110f71c0fd9744929ee36f4d79df4507b135558
Author: xlz926 <380528634@qq.com>
Date:   Fri Jun 28 14:55:48 2013 +0800

    缁堜簬鎶婄幆activit寮€鍙戠増鏈粰鏁磋繘鏉ヤ簡銆傘€?
commit 1a48d4e02bd5c5ae301d528f8bac8c1c10e06d17
Author: xlz926 <380528634@qq.com>
Date:   Sat Jun 22 14:07:53 2013 +0800

    ddfdfdfd

commit 6f2010461438f8e6fde4872414c8bd2f054d2c2c
Author: xlz926 <380528634@qq.com>
Date:   Fri Jun 21 17:57:52 2013 +0800

    娣诲姞浼樺寲鍚巐ayout

commit 29efa30b67c7fd6d52fb0448cb48fbdb6d223818
Author: xlz926 <380528634@qq.com>
Date:   Fri Jun 21 17:57:15 2013 +0800

    淇敼

commit c29fb9cca9062751a3e0b87e32ed371f3708ab3c
Author: xlz926 <380528634@qq.com>
Date:   Tue Jun 18 18:05:45 2013 +0800

    娣诲姞妯℃澘

commit deae0ef0e65b22b0693e6792ec308d1a9e771604
Author: xlz926 <380528634@qq.com>
Date:   Mon Jun 17 18:01:27 2013 +0800

    淇敼

commit 3fcf016e250e363f746238d256a098b700279387
Author: xlz926 <380528634@qq.com>
Date:   Mon Jun 17 17:11:31 2013 +0800

    娴嬭瘯淇敼
添加初始化
添加修改
添加测试功能
Merge branch 'master' into JPA

Conflicts:
	src/main/java/com/activiti/demo/web/actions/Index.java
JPA休改