Merge from PLATFORM_5
Merge branch 'master' of https://github.com/idega/com.idega.content into BRANCH_PLATFORM_5

Conflicts:
	src/java/com/idega/content/upload/business/FileUploader.java
	src/java/com/idega/content/upload/business/FileUploaderBean.java