Adding content dowload and serve urls
Merge branch 'BRANCH_PLATFORM_5' of github.com:idega/com.idega.content into BRANCH_PLATFORM_5
Merge branch 'BRANCH_PLATFORM_5' of github.com:idega/com.idega.content into BRANCH_PLATFORM_5

Conflicts:
	src/java/com/idega/content/upload/business/ContentUrl.java