KTI-21: disabling tests currently not supported in KTI branch
updating to JDK 1.6
updating to JDK 1.6
Merge branch '1.1.x' into kti
releasing plugin version 1.1.1.5-kti
-explicitly implementing marker interface
-storing AGGREGATE_DRILL_DOWN Collector to DB during BootStrap
Merge branch '1.1.x' into kti

Conflicts:
	RiskAnalyticsPropertyCasualtyGrailsPlugin.groovy
	application.properties
	plugin.xml
releasing plugin version 1.1.3-kti
Merge branch '1.1.x' into kti

Conflicts:
	RiskAnalyticsPropertyCasualtyGrailsPlugin.groovy
	application.properties
	plugin.xml
release 1.1.3.1-kti
Merge branch '1.1.x' into kti

Conflicts:
	RiskAnalyticsPropertyCasualtyGrailsPlugin.groovy
	plugin.xml
release 1.2-kti plugin
Merge branch 'master' into kti

Conflicts:
	RiskAnalyticsPC-grailsPlugins.iml
	RiskAnalyticsPropertyCasualtyGrailsPlugin.groovy
	application.properties
	plugin.xml
	test/integration/AggregateDrillDownCollectingModeStrategyTests.groovy
	test/integration/CapitalEagleAttritionalDependenciesModelTests.groovy
	test/integration/DynamicCapitalEagleModelTests.groovy
	test/integration/MultiCompanyModelTests.groovy
	test/integration/PodraModelTests.groovy
	test/integration/PodraPCModelTests.groovy
	test/integration/PodraPModelTests.groovy
	test/integration/ReinsuranceComparisonModelTests.groovy
merged from master
Merge branch '1.2.x' into kti

Conflicts:
	RiskAnalyticsPropertyCasualtyGrailsPlugin.groovy
	grails-app/conf/BuildConfig.groovy
	plugin.xml
Merge branch '1.2.x' into kti

Conflicts:
	.idea/misc.xml
	RiskAnalyticsPC-grailsPlugins.iml
Merge branch '1.2.x' into kti
merged from master, updated to grails 1.3.7 (2 tests fail at the moment)
Merge branch 'kti' of github.com:pillarone/risk-analytics-property-casualty into kti
fix build: inYieldModellingChoices was not a property. remaining question: why is there a difference between the master and kti branch in such a case?