Test changes 1
Merge remote-tracking branch 'origin/dev_test'
Merge remote-tracking branch 'origin/master' into dev_test
Fixed conflict

Conflicts:
	spfe-test.xml