Fixed friend module and fix payment, tax checkout
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.xml
	js/config/constants.js