change ignore
Merge branch 'develop' of https://github.com/chinkei/Fresh into develop

Conflicts:
	.gitignore
修改环境变量为开发环境
Merge branch 'develop' of https://github.com/chinkei/Fresh into develop