test from vmware pc 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	module/Application/view/application/index/index.phtml
test from vmware pc 3