update git
Merge branch 'master' of github.com:ducthang310/magento1411

Conflicts:
	.gitignore