test from nimol here...
Merge remote-tracking branch 'origin/master'

Conflicts:
	module/Application/view/application/index/index.phtml