添加config目录
	new file:   vendor/ZF2
zf2配置完成
	new file:   .settings/.jsdtscope
	new file:   .settings/org.eclipse.php.core.prefs
	new file:   .settings/org.eclipse.wst.jsdt.ui.superType.container
	new file:   .settings/org.eclipse.wst.jsdt.ui.superType.name
	deleted:    .settings/.jsdtscope
	deleted:    .settings/org.eclipse.php.core.prefs
	deleted:    .settings/org.eclipse.wst.jsdt.ui.superType.container
	deleted:    .settings/org.eclipse.wst.jsdt.ui.superType.name
忽略.settings目录
合并stock功能分支
删除.buildpath文件
Merge branch 'develop'

Conflicts:
	config/application.config.php
	config/autoload/global.php
	module/Application/Module.php
	module/Application/config/module.config.php
	module/Application/view/layout/layout.phtml