Squashed commit of the following:

commit 48ec4706edc445e717664e291acd33233fa3adf9
Author: godlikeyou <841483234@qq.com>
Date:   Wed Dec 24 11:40:18 2014 +0800

	Merge remote-tracking branch 'origin/master'

commit 62b06e87e3394207d8ee15c69625993144c3e200
Author: godlikeyou <841483234@qq.com>
Date:   Wed Dec 24 11:34:57 2014 +0800

	用户

commit 8b1a6903890505e57edc8e0f82e65a88cd0074e8
Author: godlikeyou <841483234@qq.com>
Date:   Wed Dec 24 11:27:05 2014 +0800

	Merge remote-tracking branch 'origin/master'

commit ae0822d8d245644b2e2cdfd03b3955f3e406f7bf
Author: godlikeyou <841483234@qq.com>
Date:   Wed Dec 24 11:23:41 2014 +0800

	login