WEBCART-99 - Fixed ant build
Merge remote-tracking branch 'upstream/master'

Conflicts:
	RcmTabs/view/rcm-tabs/plugin.phtml
Merge pull request #14 from wshafer/build-fix

WEBCART-99 - Fixed ant build