its the first commit kamouch amine 4
its the first commit kamouch amine 5
Merge origin/master

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