Signed-off-by: skype20130201 <13072731860@163.com>
Merge branch 'master' of https://github.com/skype20130201/contract.git

Conflicts:
	src/com/bfuture/action/Test2.java