diff --git a/confluence/.idea/.name b/confluence/.idea/.name
new file mode 100644
index 00000000000..641844e16cf
--- /dev/null
+++ b/confluence/.idea/.name
@@ -0,0 +1 @@
+confluence
\ No newline at end of file
diff --git a/confluence/.idea/compiler.xml b/confluence/.idea/compiler.xml
new file mode 100644
index 00000000000..ef7bf86ef67
--- /dev/null
+++ b/confluence/.idea/compiler.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/confluence/.idea/copyright/profiles_settings.xml b/confluence/.idea/copyright/profiles_settings.xml
new file mode 100644
index 00000000000..3572571ad83
--- /dev/null
+++ b/confluence/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/encodings.xml b/confluence/.idea/encodings.xml
new file mode 100644
index 00000000000..e206d70d859
--- /dev/null
+++ b/confluence/.idea/encodings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/confluence/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/confluence/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
new file mode 100644
index 00000000000..30ff5cb7910
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__asm_asm_1_5_3.xml b/confluence/.idea/libraries/Maven__asm_asm_1_5_3.xml
new file mode 100644
index 00000000000..a49e53040e1
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__asm_asm_1_5_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__axis_axis_1_2_1.xml b/confluence/.idea/libraries/Maven__axis_axis_1_2_1.xml
new file mode 100644
index 00000000000..83151b16083
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__axis_axis_1_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__axis_axis_jaxrpc_1_2_1_noqname.xml b/confluence/.idea/libraries/Maven__axis_axis_jaxrpc_1_2_1_noqname.xml
new file mode 100644
index 00000000000..d11e10548a9
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__axis_axis_jaxrpc_1_2_1_noqname.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__axis_axis_saaj_1_2_1.xml b/confluence/.idea/libraries/Maven__axis_axis_saaj_1_2_1.xml
new file mode 100644
index 00000000000..8bc7aecc07f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__axis_axis_saaj_1_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__batik_batik_all_1_6.xml b/confluence/.idea/libraries/Maven__batik_batik_all_1_6.xml
new file mode 100644
index 00000000000..f975e07b255
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__batik_batik_all_1_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__biz_aQute_bndlib_0_0_255.xml b/confluence/.idea/libraries/Maven__biz_aQute_bndlib_0_0_255.xml
new file mode 100644
index 00000000000..b633f786b61
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__biz_aQute_bndlib_0_0_255.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__c3p0_c3p0_0_9_1_2.xml b/confluence/.idea/libraries/Maven__c3p0_c3p0_0_9_1_2.xml
new file mode 100644
index 00000000000..fead87ba590
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__c3p0_c3p0_0_9_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__cglib_cglib_2_1_3.xml b/confluence/.idea/libraries/Maven__cglib_cglib_2_1_3.xml
new file mode 100644
index 00000000000..695f88a1984
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__cglib_cglib_2_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_applinks_applinks_api_3_3.xml b/confluence/.idea/libraries/Maven__com_atlassian_applinks_applinks_api_3_3.xml
new file mode 100644
index 00000000000..bf37575377f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_applinks_applinks_api_3_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_applinks_applinks_host_3_3.xml b/confluence/.idea/libraries/Maven__com_atlassian_applinks_applinks_host_3_3.xml
new file mode 100644
index 00000000000..a3dcc7e2ba4
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_applinks_applinks_host_3_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_applinks_applinks_spi_3_3.xml b/confluence/.idea/libraries/Maven__com_atlassian_applinks_applinks_spi_3_3.xml
new file mode 100644
index 00000000000..810155edf1d
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_applinks_applinks_spi_3_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_bandana_atlassian_bandana_3_1.xml b/confluence/.idea/libraries/Maven__com_atlassian_bandana_atlassian_bandana_3_1.xml
new file mode 100644
index 00000000000..e64fac4223b
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_bandana_atlassian_bandana_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_bonnie_atlassian_bonnie_4_0_beta3.xml b/confluence/.idea/libraries/Maven__com_atlassian_bonnie_atlassian_bonnie_4_0_beta3.xml
new file mode 100644
index 00000000000..7b1e7381588
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_bonnie_atlassian_bonnie_4_0_beta3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_cache_atlassian_cache_api_0_1.xml b/confluence/.idea/libraries/Maven__com_atlassian_cache_atlassian_cache_api_0_1.xml
new file mode 100644
index 00000000000..34a2402f5ae
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_cache_atlassian_cache_api_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_cache_atlassian_cache_memory_0_1.xml b/confluence/.idea/libraries/Maven__com_atlassian_cache_atlassian_cache_memory_0_1.xml
new file mode 100644
index 00000000000..59d6db41a8f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_cache_atlassian_cache_memory_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_config_atlassian_config_0_13_2.xml b/confluence/.idea/libraries/Maven__com_atlassian_config_atlassian_config_0_13_2.xml
new file mode 100644
index 00000000000..87f5dcc00c1
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_config_atlassian_config_0_13_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_confluence_confluence_3_5_2.xml b/confluence/.idea/libraries/Maven__com_atlassian_confluence_confluence_3_5_2.xml
new file mode 100644
index 00000000000..f17fbf7c403
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_confluence_confluence_3_5_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_confluence_confluence_bucket_3_5_2.xml b/confluence/.idea/libraries/Maven__com_atlassian_confluence_confluence_bucket_3_5_2.xml
new file mode 100644
index 00000000000..091d76bd587
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_confluence_confluence_bucket_3_5_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_confluence_confluence_upgrade_3_5_2.xml b/confluence/.idea/libraries/Maven__com_atlassian_confluence_confluence_upgrade_3_5_2.xml
new file mode 100644
index 00000000000..90c0559392f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_confluence_confluence_upgrade_3_5_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_confluence_plugin_func_test_2_3.xml b/confluence/.idea/libraries/Maven__com_atlassian_confluence_plugin_func_test_2_3.xml
new file mode 100644
index 00000000000..e82ab109b8c
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_confluence_plugin_func_test_2_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_core_atlassian_core_4_5_8.xml b/confluence/.idea/libraries/Maven__com_atlassian_core_atlassian_core_4_5_8.xml
new file mode 100644
index 00000000000..cfd18d8d624
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_core_atlassian_core_4_5_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_atlassian_embedded_crowd_atlassian_user_1_2_4.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_atlassian_embedded_crowd_atlassian_user_1_2_4.xml
new file mode 100644
index 00000000000..cbdf725123d
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_atlassian_embedded_crowd_atlassian_user_1_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_atlassian_embedded_crowd_hibernate2_1_2_4.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_atlassian_embedded_crowd_hibernate2_1_2_4.xml
new file mode 100644
index 00000000000..0cd4a7b64fc
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_atlassian_embedded_crowd_hibernate2_1_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_api_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_api_2_2_5.xml
new file mode 100644
index 00000000000..d8c40317dac
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_api_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_core_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_core_2_2_5.xml
new file mode 100644
index 00000000000..4aa5f018902
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_core_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_events_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_events_2_2_5.xml
new file mode 100644
index 00000000000..7664ee654d2
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_events_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_api_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_api_2_2_5.xml
new file mode 100644
index 00000000000..53ea19b4d17
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_api_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_client_common_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_client_common_2_2_5.xml
new file mode 100644
index 00000000000..529af400204
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_client_common_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_client_rest_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_client_rest_2_2_5.xml
new file mode 100644
index 00000000000..f74a6608ca4
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_client_rest_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_seraph22_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_seraph22_2_2_5.xml
new file mode 100644
index 00000000000..360d223f6f0
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_integration_seraph22_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_ldap_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_ldap_2_2_5.xml
new file mode 100644
index 00000000000..10c2112b0c4
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_ldap_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_password_encoders_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_password_encoders_2_2_5.xml
new file mode 100644
index 00000000000..4258ca8d5d2
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_password_encoders_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_persistence_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_persistence_2_2_5.xml
new file mode 100644
index 00000000000..cffb9b55852
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_persistence_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_remote_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_remote_2_2_5.xml
new file mode 100644
index 00000000000..d392762cd1d
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_crowd_remote_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_embedded_crowd_api_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_embedded_crowd_api_2_2_5.xml
new file mode 100644
index 00000000000..66a0205f936
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_embedded_crowd_api_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_embedded_crowd_core_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_embedded_crowd_core_2_2_5.xml
new file mode 100644
index 00000000000..c41657dc139
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_embedded_crowd_core_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_crowd_embedded_crowd_spi_2_2_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_crowd_embedded_crowd_spi_2_2_5.xml
new file mode 100644
index 00000000000..2d1162b1585
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_crowd_embedded_crowd_spi_2_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_event_atlassian_event_2_0_6.xml b/confluence/.idea/libraries/Maven__com_atlassian_event_atlassian_event_2_0_6.xml
new file mode 100644
index 00000000000..39f13dc6687
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_event_atlassian_event_2_0_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_extras_atlassian_extras_2_4.xml b/confluence/.idea/libraries/Maven__com_atlassian_extras_atlassian_extras_2_4.xml
new file mode 100644
index 00000000000..b153e22cc07
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_extras_atlassian_extras_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_gzipfilter_atlassian_gzipfilter_1_9.xml b/confluence/.idea/libraries/Maven__com_atlassian_gzipfilter_atlassian_gzipfilter_1_9.xml
new file mode 100644
index 00000000000..31a3f7bc602
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_gzipfilter_atlassian_gzipfilter_1_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_jdk_utilities_atlassian_jdk_utilities_0_4.xml b/confluence/.idea/libraries/Maven__com_atlassian_jdk_utilities_atlassian_jdk_utilities_0_4.xml
new file mode 100644
index 00000000000..96ceaa2d0f7
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_jdk_utilities_atlassian_jdk_utilities_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_johnson_atlassian_johnson_0_10.xml b/confluence/.idea/libraries/Maven__com_atlassian_johnson_atlassian_johnson_0_10.xml
new file mode 100644
index 00000000000..7788d1bb35a
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_johnson_atlassian_johnson_0_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_mail_atlassian_mail_1_16.xml b/confluence/.idea/libraries/Maven__com_atlassian_mail_atlassian_mail_1_16.xml
new file mode 100644
index 00000000000..d9cf6de183d
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_mail_atlassian_mail_1_16.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_modzdetector_modz_detector_0_8.xml b/confluence/.idea/libraries/Maven__com_atlassian_modzdetector_modz_detector_0_8.xml
new file mode 100644
index 00000000000..1df9d471489
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_modzdetector_modz_detector_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_multitenant_multitenant_core_1_0_m14.xml b/confluence/.idea/libraries/Maven__com_atlassian_multitenant_multitenant_core_1_0_m14.xml
new file mode 100644
index 00000000000..1cd3f72458a
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_multitenant_multitenant_core_1_0_m14.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_paddle_atlassian_paddle_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_paddle_atlassian_paddle_5.xml
new file mode 100644
index 00000000000..8245219467b
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_paddle_atlassian_paddle_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_core_2_7_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_core_2_7_5.xml
new file mode 100644
index 00000000000..1546384ac29
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_core_2_7_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_osgi_2_7_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_osgi_2_7_5.xml
new file mode 100644
index 00000000000..9f2804ae12f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_osgi_2_7_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_osgi_events_2_7_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_osgi_events_2_7_5.xml
new file mode 100644
index 00000000000..41a92f72ce7
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_osgi_events_2_7_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_servlet_2_7_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_servlet_2_7_5.xml
new file mode 100644
index 00000000000..18629e0ff64
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_servlet_2_7_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_spring_2_7_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_spring_2_7_5.xml
new file mode 100644
index 00000000000..54bf42682d7
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_spring_2_7_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_webfragment_2_7_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_webfragment_2_7_5.xml
new file mode 100644
index 00000000000..fee47bcd0ca
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_webfragment_2_7_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_webresource_2_7_5.xml b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_webresource_2_7_5.xml
new file mode 100644
index 00000000000..2ba848a77c9
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_plugins_atlassian_plugins_webresource_2_7_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_profiling_atlassian_profiling_1_8_1.xml b/confluence/.idea/libraries/Maven__com_atlassian_profiling_atlassian_profiling_1_8_1.xml
new file mode 100644
index 00000000000..b216e4057ec
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_profiling_atlassian_profiling_1_8_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_renderer_atlassian_renderer_7_0.xml b/confluence/.idea/libraries/Maven__com_atlassian_renderer_atlassian_renderer_7_0.xml
new file mode 100644
index 00000000000..a8ba7383f37
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_renderer_atlassian_renderer_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_sal_sal_api_2_4_1.xml b/confluence/.idea/libraries/Maven__com_atlassian_sal_sal_api_2_4_1.xml
new file mode 100644
index 00000000000..8d0011156b3
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_sal_sal_api_2_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_sal_sal_spi_2_4_1.xml b/confluence/.idea/libraries/Maven__com_atlassian_sal_sal_spi_2_4_1.xml
new file mode 100644
index 00000000000..279daafd63f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_sal_sal_spi_2_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_sal_sal_spring_2_4_1.xml b/confluence/.idea/libraries/Maven__com_atlassian_sal_sal_spring_2_4_1.xml
new file mode 100644
index 00000000000..e3e2ba59db0
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_sal_sal_spring_2_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_security_atlassian_cookie_tools_2_0.xml b/confluence/.idea/libraries/Maven__com_atlassian_security_atlassian_cookie_tools_2_0.xml
new file mode 100644
index 00000000000..70325f6137b
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_security_atlassian_cookie_tools_2_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_security_atlassian_password_encoder_1_0.xml b/confluence/.idea/libraries/Maven__com_atlassian_security_atlassian_password_encoder_1_0.xml
new file mode 100644
index 00000000000..aa41220ed4f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_security_atlassian_password_encoder_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_security_atlassian_secure_random_1_0.xml b/confluence/.idea/libraries/Maven__com_atlassian_security_atlassian_secure_random_1_0.xml
new file mode 100644
index 00000000000..6d2cc1eae20
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_security_atlassian_secure_random_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_security_auth_trustedapps_atlassian_trusted_apps_core_2_3_1.xml b/confluence/.idea/libraries/Maven__com_atlassian_security_auth_trustedapps_atlassian_trusted_apps_core_2_3_1.xml
new file mode 100644
index 00000000000..1ec036ac7b1
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_security_auth_trustedapps_atlassian_trusted_apps_core_2_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_security_auth_trustedapps_atlassian_trusted_apps_seraph_integration_2_3_1.xml b/confluence/.idea/libraries/Maven__com_atlassian_security_auth_trustedapps_atlassian_trusted_apps_seraph_integration_2_3_1.xml
new file mode 100644
index 00000000000..c91f8761cab
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_security_auth_trustedapps_atlassian_trusted_apps_seraph_integration_2_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_seraph_atlassian_seraph_2_4_0.xml b/confluence/.idea/libraries/Maven__com_atlassian_seraph_atlassian_seraph_2_4_0.xml
new file mode 100644
index 00000000000..40a4bab2067
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_seraph_atlassian_seraph_2_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_spring_atlassian_spring_2_0_rc4.xml b/confluence/.idea/libraries/Maven__com_atlassian_spring_atlassian_spring_2_0_rc4.xml
new file mode 100644
index 00000000000..8003ee74811
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_spring_atlassian_spring_2_0_rc4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_spring_atlassian_spring_hibernate2_2_0_rc4.xml b/confluence/.idea/libraries/Maven__com_atlassian_spring_atlassian_spring_hibernate2_2_0_rc4.xml
new file mode 100644
index 00000000000..36f4ed56d38
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_spring_atlassian_spring_hibernate2_2_0_rc4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_trackback_atlassian_trackback_0_10.xml b/confluence/.idea/libraries/Maven__com_atlassian_trackback_atlassian_trackback_0_10.xml
new file mode 100644
index 00000000000..f352cd0ecb5
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_trackback_atlassian_trackback_0_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_user_atlassian_user_3_0.xml b/confluence/.idea/libraries/Maven__com_atlassian_user_atlassian_user_3_0.xml
new file mode 100644
index 00000000000..3cb142dc08c
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_user_atlassian_user_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_util_concurrent_atlassian_util_concurrent_0_0_12.xml b/confluence/.idea/libraries/Maven__com_atlassian_util_concurrent_atlassian_util_concurrent_0_0_12.xml
new file mode 100644
index 00000000000..925d72941f6
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_util_concurrent_atlassian_util_concurrent_0_0_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_velocity_atlassian_velocity_0_7.xml b/confluence/.idea/libraries/Maven__com_atlassian_velocity_atlassian_velocity_0_7.xml
new file mode 100644
index 00000000000..d27f0335686
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_velocity_atlassian_velocity_0_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_xwork_atlassian_xwork_10_1_12.xml b/confluence/.idea/libraries/Maven__com_atlassian_xwork_atlassian_xwork_10_1_12.xml
new file mode 100644
index 00000000000..c431c7acdb4
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_xwork_atlassian_xwork_10_1_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_atlassian_xwork_atlassian_xwork_core_1_12.xml b/confluence/.idea/libraries/Maven__com_atlassian_xwork_atlassian_xwork_core_1_12.xml
new file mode 100644
index 00000000000..f219928f738
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_atlassian_xwork_atlassian_xwork_core_1_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_google_collections_google_collections_1_0.xml b/confluence/.idea/libraries/Maven__com_google_collections_google_collections_1_0.xml
new file mode 100644
index 00000000000..7ed5d20e2d4
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_google_collections_google_collections_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_ibm_icu_icu4j_3_8.xml b/confluence/.idea/libraries/Maven__com_ibm_icu_icu4j_3_8.xml
new file mode 100644
index 00000000000..0114a3f52a8
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_ibm_icu_icu4j_3_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_octo_captcha_jcaptcha_all_1_0_RC6.xml b/confluence/.idea/libraries/Maven__com_octo_captcha_jcaptcha_all_1_0_RC6.xml
new file mode 100644
index 00000000000..3fffc2c735a
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_octo_captcha_jcaptcha_all_1_0_RC6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_sun_jai_codec_1_1_3.xml b/confluence/.idea/libraries/Maven__com_sun_jai_codec_1_1_3.xml
new file mode 100644
index 00000000000..4321ce3251d
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_sun_jai_codec_1_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_sun_jai_core_1_1_3.xml b/confluence/.idea/libraries/Maven__com_sun_jai_core_1_1_3.xml
new file mode 100644
index 00000000000..a998f2fe81f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_sun_jai_core_1_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_1_1.xml b/confluence/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_1_1.xml
new file mode 100644
index 00000000000..71b652fb682
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_1_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_6_1.xml b/confluence/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_6_1.xml
new file mode 100644
index 00000000000..6eeab12ce6d
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_6_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml b/confluence/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml
new file mode 100644
index 00000000000..2b149c4de28
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__commons_collections_commons_collections_3_2.xml b/confluence/.idea/libraries/Maven__commons_collections_commons_collections_3_2.xml
new file mode 100644
index 00000000000..73b28f310bf
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__commons_collections_commons_collections_3_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__commons_digester_commons_digester_1_5.xml b/confluence/.idea/libraries/Maven__commons_digester_commons_digester_1_5.xml
new file mode 100644
index 00000000000..4a947b08dc1
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__commons_digester_commons_digester_1_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__commons_discovery_commons_discovery_0_2.xml b/confluence/.idea/libraries/Maven__commons_discovery_commons_discovery_0_2.xml
new file mode 100644
index 00000000000..5c97345cafe
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__commons_discovery_commons_discovery_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_1.xml b/confluence/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_1.xml
new file mode 100644
index 00000000000..e59b3ef50cb
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0.xml b/confluence/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0.xml
new file mode 100644
index 00000000000..cc22b931de6
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__commons_io_commons_io_1_4.xml b/confluence/.idea/libraries/Maven__commons_io_commons_io_1_4.xml
new file mode 100644
index 00000000000..054eda88eed
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__commons_io_commons_io_1_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__commons_jrcs_commons_jrcs_diff_0_1_7.xml b/confluence/.idea/libraries/Maven__commons_jrcs_commons_jrcs_diff_0_1_7.xml
new file mode 100644
index 00000000000..a16dd40f37b
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__commons_jrcs_commons_jrcs_diff_0_1_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/confluence/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
new file mode 100644
index 00000000000..5e8b8d3352e
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml b/confluence/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml
new file mode 100644
index 00000000000..b770f56aa97
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__concurrent_concurrent_1_3_4.xml b/confluence/.idea/libraries/Maven__concurrent_concurrent_1_3_4.xml
new file mode 100644
index 00000000000..4acbd2f600b
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__concurrent_concurrent_1_3_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__dom4j_dom4j_1_4_full.xml b/confluence/.idea/libraries/Maven__dom4j_dom4j_1_4_full.xml
new file mode 100644
index 00000000000..8fdc45e28b5
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__dom4j_dom4j_1_4_full.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__exml_exml_7_1.xml b/confluence/.idea/libraries/Maven__exml_exml_7_1.xml
new file mode 100644
index 00000000000..ec25f4e832e
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__exml_exml_7_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__glue_glue_5_0b2.xml b/confluence/.idea/libraries/Maven__glue_glue_5_0b2.xml
new file mode 100644
index 00000000000..ceb3b310327
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__glue_glue_5_0b2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__hibernate_hibernate_2_1_8_atlassian_9.xml b/confluence/.idea/libraries/Maven__hibernate_hibernate_2_1_8_atlassian_9.xml
new file mode 100644
index 00000000000..86441b1755a
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__hibernate_hibernate_2_1_8_atlassian_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__javax_activation_activation_1_0_2.xml b/confluence/.idea/libraries/Maven__javax_activation_activation_1_0_2.xml
new file mode 100644
index 00000000000..f453d9b23f6
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__javax_activation_activation_1_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml b/confluence/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml
new file mode 100644
index 00000000000..2c155f3a1fb
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__javax_servlet_servlet_api_2_4.xml b/confluence/.idea/libraries/Maven__javax_servlet_servlet_api_2_4.xml
new file mode 100644
index 00000000000..eb1ede25488
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__javax_servlet_servlet_api_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__javax_transaction_jta_1_0_1B.xml b/confluence/.idea/libraries/Maven__javax_transaction_jta_1_0_1B.xml
new file mode 100644
index 00000000000..391fe350a14
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__javax_transaction_jta_1_0_1B.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml b/confluence/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
new file mode 100644
index 00000000000..2a4dd7a2e50
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__jdom_jdom_1_0.xml b/confluence/.idea/libraries/Maven__jdom_jdom_1_0.xml
new file mode 100644
index 00000000000..3349d675fba
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__jdom_jdom_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__jfree_jcommon_1_0_0.xml b/confluence/.idea/libraries/Maven__jfree_jcommon_1_0_0.xml
new file mode 100644
index 00000000000..733dc3fcb8d
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__jfree_jcommon_1_0_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__jfree_jfreechart_1_0_0.xml b/confluence/.idea/libraries/Maven__jfree_jfreechart_1_0_0.xml
new file mode 100644
index 00000000000..4654abe6fd5
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__jfree_jfreechart_1_0_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__joda_time_joda_time_1_6.xml b/confluence/.idea/libraries/Maven__joda_time_joda_time_1_6.xml
new file mode 100644
index 00000000000..a6fe1789647
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__joda_time_joda_time_1_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__junit_junit_4_6.xml b/confluence/.idea/libraries/Maven__junit_junit_4_6.xml
new file mode 100644
index 00000000000..07e29e2f84c
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__junit_junit_4_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__log4j_log4j_1_2_15.xml b/confluence/.idea/libraries/Maven__log4j_log4j_1_2_15.xml
new file mode 100644
index 00000000000..c6024af8c41
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__log4j_log4j_1_2_15.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__mockobjects_alt_jdk1_3_0_07.xml b/confluence/.idea/libraries/Maven__mockobjects_alt_jdk1_3_0_07.xml
new file mode 100644
index 00000000000..a56dde5b819
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__mockobjects_alt_jdk1_3_0_07.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__mockobjects_mockobjects_alt_jdk1_3_j2ee1_3_0_09.xml b/confluence/.idea/libraries/Maven__mockobjects_mockobjects_alt_jdk1_3_j2ee1_3_0_09.xml
new file mode 100644
index 00000000000..2ccb999080b
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__mockobjects_mockobjects_alt_jdk1_3_j2ee1_3_0_09.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__net_java_dev_stax_utils_stax_utils_20040917.xml b/confluence/.idea/libraries/Maven__net_java_dev_stax_utils_stax_utils_20040917.xml
new file mode 100644
index 00000000000..f0e2ad5477a
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__net_java_dev_stax_utils_stax_utils_20040917.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__net_java_dev_urlrewrite_urlrewrite_2_6_0.xml b/confluence/.idea/libraries/Maven__net_java_dev_urlrewrite_urlrewrite_2_6_0.xml
new file mode 100644
index 00000000000..1448e838ad1
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__net_java_dev_urlrewrite_urlrewrite_2_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml b/confluence/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml
new file mode 100644
index 00000000000..d29c82f6b50
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__net_sf_ehcache_ehcache_1_2_3.xml b/confluence/.idea/libraries/Maven__net_sf_ehcache_ehcache_1_2_3.xml
new file mode 100644
index 00000000000..cf5103197c9
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__net_sf_ehcache_ehcache_1_2_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__net_sf_ldaptemplate_ldaptemplate_1_0_1.xml b/confluence/.idea/libraries/Maven__net_sf_ldaptemplate_ldaptemplate_1_0_1.xml
new file mode 100644
index 00000000000..a2c0de98286
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__net_sf_ldaptemplate_ldaptemplate_1_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_5.xml b/confluence/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_5.xml
new file mode 100644
index 00000000000..8507f2ff7a5
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_5.xml b/confluence/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_5.xml
new file mode 100644
index 00000000000..d048fd28e28
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_5.xml b/confluence/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_5.xml
new file mode 100644
index 00000000000..82aa83f6c78
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__net_sourceforge_jwebunit_jwebunit_core_2_2.xml b/confluence/.idea/libraries/Maven__net_sourceforge_jwebunit_jwebunit_core_2_2.xml
new file mode 100644
index 00000000000..acecc6cc5e9
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__net_sourceforge_jwebunit_jwebunit_core_2_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__net_sourceforge_jwebunit_jwebunit_htmlunit_plugin_2_2.xml b/confluence/.idea/libraries/Maven__net_sourceforge_jwebunit_jwebunit_htmlunit_plugin_2_2.xml
new file mode 100644
index 00000000000..0e1015a0711
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__net_sourceforge_jwebunit_jwebunit_htmlunit_plugin_2_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_12.xml b/confluence/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_12.xml
new file mode 100644
index 00000000000..33a21fc9d4e
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__odmg_odmg_3_0.xml b/confluence/.idea/libraries/Maven__odmg_odmg_3_0.xml
new file mode 100644
index 00000000000..a7d4eb22a47
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__odmg_odmg_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__ognl_ognl_2_6_5_atlassian_2.xml b/confluence/.idea/libraries/Maven__ognl_ognl_2_6_5_atlassian_2.xml
new file mode 100644
index 00000000000..9a80fd09d55
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__ognl_ognl_2_6_5_atlassian_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__opensymphony_oscore_2_2_7_atlassian_1.xml b/confluence/.idea/libraries/Maven__opensymphony_oscore_2_2_7_atlassian_1.xml
new file mode 100644
index 00000000000..c5425dc436c
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__opensymphony_oscore_2_2_7_atlassian_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__opensymphony_propertyset_1_3_21Nov03.xml b/confluence/.idea/libraries/Maven__opensymphony_propertyset_1_3_21Nov03.xml
new file mode 100644
index 00000000000..86a7bea7d32
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__opensymphony_propertyset_1_3_21Nov03.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__opensymphony_sitemesh_2_3_atlassian.xml b/confluence/.idea/libraries/Maven__opensymphony_sitemesh_2_3_atlassian.xml
new file mode 100644
index 00000000000..7fbff89fba9
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__opensymphony_sitemesh_2_3_atlassian.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__opensymphony_webwork_2_1_5_atlassian_2.xml b/confluence/.idea/libraries/Maven__opensymphony_webwork_2_1_5_atlassian_2.xml
new file mode 100644
index 00000000000..0e1be0423d2
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__opensymphony_webwork_2_1_5_atlassian_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__opensymphony_xwork_1_0_3_2.xml b/confluence/.idea/libraries/Maven__opensymphony_xwork_1_0_3_2.xml
new file mode 100644
index 00000000000..a298796d89c
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__opensymphony_xwork_1_0_3_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_felix_org_apache_felix_framework_3_0_2.xml b/confluence/.idea/libraries/Maven__org_apache_felix_org_apache_felix_framework_3_0_2.xml
new file mode 100644
index 00000000000..35187e5a7b1
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_felix_org_apache_felix_framework_3_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_2_9_4.xml b/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_2_9_4.xml
new file mode 100644
index 00000000000..2a5bcd5cf3f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_analyzers_2_9_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_core_2_9_4.xml b/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_core_2_9_4.xml
new file mode 100644
index 00000000000..363169fa2a7
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_core_2_9_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_highlighter_2_9_4.xml b/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_highlighter_2_9_4.xml
new file mode 100644
index 00000000000..9e0a268aecd
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_highlighter_2_9_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_memory_2_9_4.xml b/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_memory_2_9_4.xml
new file mode 100644
index 00000000000..def13b2aacb
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_memory_2_9_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_misc_2_9_4.xml b/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_misc_2_9_4.xml
new file mode 100644
index 00000000000..1cbb369e41f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_lucene_lucene_misc_2_9_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_pdfbox_fontbox_1_2_1.xml b/confluence/.idea/libraries/Maven__org_apache_pdfbox_fontbox_1_2_1.xml
new file mode 100644
index 00000000000..d933e74a706
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_pdfbox_fontbox_1_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_pdfbox_jempbox_1_2_1.xml b/confluence/.idea/libraries/Maven__org_apache_pdfbox_jempbox_1_2_1.xml
new file mode 100644
index 00000000000..84402967e7c
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_pdfbox_jempbox_1_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_1_2_1.xml b/confluence/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_1_2_1.xml
new file mode 100644
index 00000000000..52eabfa6d7c
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_1_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_poi_poi_3_5_FINAL.xml b/confluence/.idea/libraries/Maven__org_apache_poi_poi_3_5_FINAL.xml
new file mode 100644
index 00000000000..2d22ab1c178
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_poi_poi_3_5_FINAL.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_poi_poi_scratchpad_3_5_FINAL.xml b/confluence/.idea/libraries/Maven__org_apache_poi_poi_scratchpad_3_5_FINAL.xml
new file mode 100644
index 00000000000..947dd72cbd8
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_poi_poi_scratchpad_3_5_FINAL.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_velocity_velocity_1_6_1_atlassian_2.xml b/confluence/.idea/libraries/Maven__org_apache_velocity_velocity_1_6_1_atlassian_2.xml
new file mode 100644
index 00000000000..2aa6e213d2c
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_velocity_velocity_1_6_1_atlassian_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_apache_ws_commons_XmlSchema_1_1.xml b/confluence/.idea/libraries/Maven__org_apache_ws_commons_XmlSchema_1_1.xml
new file mode 100644
index 00000000000..6b5c280edec
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_apache_ws_commons_XmlSchema_1_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_6_0.xml b/confluence/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_6_0.xml
new file mode 100644
index 00000000000..e16d50af933
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_bouncycastle_bcmail_jdk15_1_44.xml b/confluence/.idea/libraries/Maven__org_bouncycastle_bcmail_jdk15_1_44.xml
new file mode 100644
index 00000000000..cb97b14d799
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_bouncycastle_bcmail_jdk15_1_44.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15_1_44.xml b/confluence/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15_1_44.xml
new file mode 100644
index 00000000000..8f000654d01
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15_1_44.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_4.xml b/confluence/.idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_4.xml
new file mode 100644
index 00000000000..1f1ad72371f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_codehaus_xfire_xfire_aegis_1_2_6.xml b/confluence/.idea/libraries/Maven__org_codehaus_xfire_xfire_aegis_1_2_6.xml
new file mode 100644
index 00000000000..8d9f879fdbe
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_codehaus_xfire_xfire_aegis_1_2_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_codehaus_xfire_xfire_core_1_2_6.xml b/confluence/.idea/libraries/Maven__org_codehaus_xfire_xfire_core_1_2_6.xml
new file mode 100644
index 00000000000..c3ded8bb4e9
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_codehaus_xfire_xfire_core_1_2_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_directwebremoting_dwr_2_0_3.xml b/confluence/.idea/libraries/Maven__org_directwebremoting_dwr_2_0_3.xml
new file mode 100644
index 00000000000..d45d92ae360
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_directwebremoting_dwr_2_0_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_hibernate_jtidy_r8_20060801.xml b/confluence/.idea/libraries/Maven__org_hibernate_jtidy_r8_20060801.xml
new file mode 100644
index 00000000000..028d1c29400
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_hibernate_jtidy_r8_20060801.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_hsqldb_hsqldb_2_0_1_rc3_20110120.xml b/confluence/.idea/libraries/Maven__org_hsqldb_hsqldb_2_0_1_rc3_20110120.xml
new file mode 100644
index 00000000000..95d8490ecc5
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_hsqldb_hsqldb_2_0_1_rc3_20110120.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_quartz_scheduler_quartz_1_8_0.xml b/confluence/.idea/libraries/Maven__org_quartz_scheduler_quartz_1_8_0.xml
new file mode 100644
index 00000000000..6422eb2e1dc
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_quartz_scheduler_quartz_1_8_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_5_8.xml b/confluence/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_5_8.xml
new file mode 100644
index 00000000000..7ca6a1766ba
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_5_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_slf4j_slf4j_api_1_5_8.xml b/confluence/.idea/libraries/Maven__org_slf4j_slf4j_api_1_5_8.xml
new file mode 100644
index 00000000000..0ea470ab5b1
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_slf4j_slf4j_api_1_5_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_5_8.xml b/confluence/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_5_8.xml
new file mode 100644
index 00000000000..f4725a3b778
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_5_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_core_1_3_0_RELEASE.xml b/confluence/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_core_1_3_0_RELEASE.xml
new file mode 100644
index 00000000000..65e4636d24e
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_core_1_3_0_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_security_spring_security_core_2_0_4.xml b/confluence/.idea/libraries/Maven__org_springframework_security_spring_security_core_2_0_4.xml
new file mode 100644
index 00000000000..45c36e70cdd
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_security_spring_security_core_2_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_spring_aop_2_0_8.xml b/confluence/.idea/libraries/Maven__org_springframework_spring_aop_2_0_8.xml
new file mode 100644
index 00000000000..89af56e4970
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_spring_aop_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_spring_beans_2_0_8.xml b/confluence/.idea/libraries/Maven__org_springframework_spring_beans_2_0_8.xml
new file mode 100644
index 00000000000..18d4c2d1a4d
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_spring_beans_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_spring_context_2_0_8.xml b/confluence/.idea/libraries/Maven__org_springframework_spring_context_2_0_8.xml
new file mode 100644
index 00000000000..87d78470b5c
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_spring_context_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_spring_core_2_0_8.xml b/confluence/.idea/libraries/Maven__org_springframework_spring_core_2_0_8.xml
new file mode 100644
index 00000000000..d5a5a6f81e5
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_spring_core_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_spring_dao_2_0_8.xml b/confluence/.idea/libraries/Maven__org_springframework_spring_dao_2_0_8.xml
new file mode 100644
index 00000000000..776aeb1154f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_spring_dao_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_spring_hibernate2_2_0_8.xml b/confluence/.idea/libraries/Maven__org_springframework_spring_hibernate2_2_0_8.xml
new file mode 100644
index 00000000000..57208898cb7
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_spring_hibernate2_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_spring_jdbc_2_0_8.xml b/confluence/.idea/libraries/Maven__org_springframework_spring_jdbc_2_0_8.xml
new file mode 100644
index 00000000000..92ca83b798b
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_spring_jdbc_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_spring_jmx_2_0_8.xml b/confluence/.idea/libraries/Maven__org_springframework_spring_jmx_2_0_8.xml
new file mode 100644
index 00000000000..0815200a9c3
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_spring_jmx_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_spring_support_2_0_8.xml b/confluence/.idea/libraries/Maven__org_springframework_spring_support_2_0_8.xml
new file mode 100644
index 00000000000..ffcdcd9e117
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_spring_support_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_springframework_spring_web_2_0_8.xml b/confluence/.idea/libraries/Maven__org_springframework_spring_web_2_0_8.xml
new file mode 100644
index 00000000000..efc445d2e4b
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_springframework_spring_web_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_twdata_pkgscanner_package_scanner_0_9_5.xml b/confluence/.idea/libraries/Maven__org_twdata_pkgscanner_package_scanner_0_9_5.xml
new file mode 100644
index 00000000000..80467858203
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_twdata_pkgscanner_package_scanner_0_9_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml b/confluence/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml
new file mode 100644
index 00000000000..af3d414615d
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__oro_oro_2_0_8.xml b/confluence/.idea/libraries/Maven__oro_oro_2_0_8.xml
new file mode 100644
index 00000000000..25203a04f0f
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__oro_oro_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__oscache_oscache_2_2.xml b/confluence/.idea/libraries/Maven__oscache_oscache_2_2.xml
new file mode 100644
index 00000000000..12991d7e7e4
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__oscache_oscache_2_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__osuser_osuser_atl_user.xml b/confluence/.idea/libraries/Maven__osuser_osuser_atl_user.xml
new file mode 100644
index 00000000000..23332027435
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__osuser_osuser_atl_user.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__radeox_radeox_1_0b2_forked_22Apr2004.xml b/confluence/.idea/libraries/Maven__radeox_radeox_1_0b2_forked_22Apr2004.xml
new file mode 100644
index 00000000000..1106eb96510
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__radeox_radeox_1_0b2_forked_22Apr2004.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__regexp_regexp_1_3.xml b/confluence/.idea/libraries/Maven__regexp_regexp_1_3.xml
new file mode 100644
index 00000000000..cdc06b6bc25
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__regexp_regexp_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__rome_rome_1_0.xml b/confluence/.idea/libraries/Maven__rome_rome_1_0.xml
new file mode 100644
index 00000000000..ca0e345b951
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__rome_rome_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__slide_slide_2_1.xml b/confluence/.idea/libraries/Maven__slide_slide_2_1.xml
new file mode 100644
index 00000000000..be3fddd5c9a
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__slide_slide_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__velocity_tools_velocity_tools_view_1_1.xml b/confluence/.idea/libraries/Maven__velocity_tools_velocity_tools_view_1_1.xml
new file mode 100644
index 00000000000..c61c8f94c7b
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__velocity_tools_velocity_tools_view_1_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__wsdl4j_wsdl4j_1_5_1.xml b/confluence/.idea/libraries/Maven__wsdl4j_wsdl4j_1_5_1.xml
new file mode 100644
index 00000000000..24358f07910
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__wsdl4j_wsdl4j_1_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__xalan_xalan_2_7_0.xml b/confluence/.idea/libraries/Maven__xalan_xalan_2_7_0.xml
new file mode 100644
index 00000000000..dd647b424bd
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__xalan_xalan_2_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml b/confluence/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
new file mode 100644
index 00000000000..19d39dba853
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__xmlrpc_xmlrpc_2_0_xmlrpc61_1_sbfix.xml b/confluence/.idea/libraries/Maven__xmlrpc_xmlrpc_2_0_xmlrpc61_1_sbfix.xml
new file mode 100644
index 00000000000..ad2bb2b85a1
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__xmlrpc_xmlrpc_2_0_xmlrpc61_1_sbfix.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/libraries/Maven__xpp3_xpp3_min_1_1_3_4_O.xml b/confluence/.idea/libraries/Maven__xpp3_xpp3_min_1_1_3_4_O.xml
new file mode 100644
index 00000000000..4cc7a5ed4a6
--- /dev/null
+++ b/confluence/.idea/libraries/Maven__xpp3_xpp3_min_1_1_3_4_O.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/misc.xml b/confluence/.idea/misc.xml
new file mode 100644
index 00000000000..84dcf70e2f6
--- /dev/null
+++ b/confluence/.idea/misc.xml
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ http://www.w3.org/1999/xhtml
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+ 1.6
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/confluence/.idea/modules.xml b/confluence/.idea/modules.xml
new file mode 100644
index 00000000000..e570ef2b587
--- /dev/null
+++ b/confluence/.idea/modules.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/confluence/.idea/scopes/scope_settings.xml b/confluence/.idea/scopes/scope_settings.xml
new file mode 100644
index 00000000000..922003b8433
--- /dev/null
+++ b/confluence/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/confluence/.idea/uiDesigner.xml b/confluence/.idea/uiDesigner.xml
new file mode 100644
index 00000000000..3b000203088
--- /dev/null
+++ b/confluence/.idea/uiDesigner.xml
@@ -0,0 +1,125 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
+
diff --git a/confluence/.idea/vcs.xml b/confluence/.idea/vcs.xml
new file mode 100644
index 00000000000..21cbaa607b2
--- /dev/null
+++ b/confluence/.idea/vcs.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/confluence/confluence.iml b/confluence/confluence.iml
index b7031cfb474..ab4a8b1a4e5 100644
--- a/confluence/confluence.iml
+++ b/confluence/confluence.iml
@@ -6,7 +6,6 @@
-
diff --git a/confluence/src/main/java/org/jetbrains/jet/lexer/JetMacro.java b/confluence/src/main/java/org/jetbrains/jet/lexer/JetMacro.java
index 4c8407779b0..be9a6f4c182 100644
--- a/confluence/src/main/java/org/jetbrains/jet/lexer/JetMacro.java
+++ b/confluence/src/main/java/org/jetbrains/jet/lexer/JetMacro.java
@@ -164,9 +164,9 @@ public class JetMacro extends BaseMacro {
private static final Map styleMap = new HashMap();
static {
- styleMap.put(JetTokens.BLOCK_COMMENT, "comment");
- styleMap.put(JetTokens.DOC_COMMENT, "comment");
- styleMap.put(JetTokens.EOL_COMMENT, "comment");
+ styleMap.put(JetTokens.BLOCK_COMMENT, "jet-comment");
+ styleMap.put(JetTokens.DOC_COMMENT, "jet-comment");
+ styleMap.put(JetTokens.EOL_COMMENT, "jet-comment");
styleMap.put(JetTokens.WHITE_SPACE, "whitespace");
styleMap.put(JetTokens.INTEGER_LITERAL, "number");
styleMap.put(JetTokens.FLOAT_LITERAL, "number");
@@ -267,7 +267,8 @@ public class JetMacro extends BaseMacro {
IElementType token = jetLexer.advance();
if (token == null) break;
- CharSequence yytext = jetLexer.yytext();
+// CharSequence yytext = jetLexer.yytext();
+ String yytext = jetLexer.yytext().toString().replaceAll("\n", "\r\n");
String style = null;
if (token instanceof JetKeywordToken) {
style = "keyword";
diff --git a/confluence/src/main/resources/jet.css b/confluence/src/main/resources/jet.css
index 098c9702e00..c63d0d60613 100644
--- a/confluence/src/main/resources/jet.css
+++ b/confluence/src/main/resources/jet.css
@@ -12,7 +12,7 @@
color: #369;
}
-.jet.comment {
+.jet.jet-comment {
color : green;
}