Moved vendor and tests directories in src/vendor and src/tests
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	build.xml