added demo city event list
Mergt branch 'master' of https://github.com/GuilhermeMedeiros/Backbase-City-Interests

Conflicts:
	launchpad-data/cs/configuration.lock.db
	launchpad-data/cs/content.lock.db
	launchpad-data/cs/resource.lock.db
	portalserver/src/main/resources/ptc-config.xml