Merge branch 'release/2.0.0'
Merge branch 'release/2.1.0'
Fixed creating the path for media files based on the language used
Merge branch 'support/2.1.1' of git://github.com/AmandaAccalai/innomedia into AmandaAccalai-support/2.1.1

Conflicts:
	build.xml
	source/setup/CHANGES
	source/setup/application.xml
Merge branch 'AmandaAccalai-support/2.1.1' into support/2.1.1
Updated version number