changes set to Liferay on Dec 19 2014
Merge branch 'lr621ga2' of github.com:rotterdam-cs/liferayImageSlider-portlet into lr621ga2

Conflicts:
	rcs-liferayImageSlider-portlet-6.2.1.1.war