Squashed commit of the following:

commit daf40c36f6be7137ebcbbc903b102a8759513d5c
Author: yangjun <yangjun.chengdu@gmail.com>
Date:   Sun Jan 12 17:30:10 2014 +0800

    update login.handlebasrs

    update login.handlebasrs

commit b38d7d8911e464e57c7630d53dd27872c7ac6329
Author: juhuashengkaidewanshang <642354045@qq.com>
Date:   Sat Jan 11 00:36:57 2014 +0800

    add

commit 42c136895b6727dbc658a257ecfd43ab28188d8b
Merge: 28f4eac 51b1f3e
Author: juhuashengkaidewanshang <642354045@qq.com>
Date:   Sat Jan 11 00:32:31 2014 +0800

    Merge branch 'master' of https://github.com/yangjun/eval

    Conflicts:
    	client/app/templates/quota/integrity.handlebars

commit 28f4eacc83099553f8b9b8bf97a44adfc20f54c5
Author: juhuashengkaidewanshang <642354045@qq.com>
Date:   Sat Jan 11 00:29:10 2014 +0800

    Squashed commit of the following:

    commit 51b1f3e1fa348517fa4f617c2d066fce55c667d8
    Author: juhuashengkaidewanshang <642354045@qq.com>
    Date:   Thu Jan 9 11:25:37 2014 +0800

        add 8
add
Merge branch 'master' of https://github.com/yangjun/eval

Conflicts:
	.gitignore