Conflicts:
	src/com/dotmarketing/portlets/contentlet/ajax/ContentletAjax.java