20140712django中关于auto_now与auto_now_add属性的区别
Merge branch 'dev' into gh-pages