Fixing https://bugzilla.redhat.com/show_bug.cgi?id=1091775
Merge branch 'master' of github.com:mcasperson/PressGangCCMSImport

Conflicts:
	src/main/webapp/index.html