Commint
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/etc/config.xml
	index.php