20141210
Merge branch 'master' of github.com:cc001116/tick-master

Conflicts:
	client/session.properties
	client/src/main/java/cn/flower/tick/client/test/UserTest.java
xiaofu
fixed conflict
20141212
tiqu
Merge branch 'master' of github.com:cc001116/tick-master