Merge remote-tracking branch 'remotes/origin/develop'
upgrade to django 1.7.1
update yaml file
Merge branch 'master' of https://github.com/zhenghongzhi/Nourriture
Merge remote-tracking branch 'remotes/origin/develop'