Added some tests for Media Upload
Merge branch 'master' of https://github.com/chaswoodfield/CultureGridFunctionalTests

Conflicts:
	test/functional/com/k_int/cultureGrid/data/Data.groovy