Merge branch 'master' of https://github.com/HelloMars/KuangNei

Conflicts:
	main/models.py
Squashed commit of the following:

commit 54635511d1f876fce789031ed615f2300c699207
Author: ndsun <feidaowangzixing@163.com>
Date:   Sat Aug 23 00:05:34 2014 +0800

    Merge branch 'master' of https://github.com/HelloMars/KuangNei

    Conflicts:
    	main/models.py

commit bc41c602dfee586ed6c42a8262c65bc3cbc73263
Author: ndsun <feidaowangzixing@163.com>
Date:   Thu Aug 21 19:01:16 2014 +0800

    post response

commit f6e860746bce0bc410b56a720f822243b878513e
Author: ndsun <feidaowangzixing@163.com>
Date:   Thu Aug 21 12:04:34 2014 +0800

    check telephone

commit 0d51914623b8a64fa194ef6fedb79cb2b6bcf9c3
Author: ndsun <feidaowangzixing@163.com>
Date:   Thu Aug 21 10:34:30 2014 +0800

    a

commit 47571047452783e3f244d88d42e774e1348aae48
Author: ndsun <feidaowangzixing@163.com>
Date:   Wed Aug 20 17:42:13 2014 +0800

    change user_info