diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_api_0_6_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_api_0_6_1_SNAPSHOT.xml
new file mode 100644
index 0000000..e8bb757
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_api_0_6_1_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: com.ning.billing:killbill-api:0.6.1-SNAPSHOT">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-api/0.6.1-SNAPSHOT/killbill-api-0.6.1-SNAPSHOT.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-api/0.6.1-SNAPSHOT/killbill-api-0.6.1-SNAPSHOT-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-api/0.6.1-SNAPSHOT/killbill-api-0.6.1-SNAPSHOT-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/server/src/main/resources/killbill-server.properties b/server/src/main/resources/killbill-server.properties
index a51c99d..7401da5 100644
--- a/server/src/main/resources/killbill-server.properties
+++ b/server/src/main/resources/killbill-server.properties
@@ -14,18 +14,11 @@
# under the License.
#
-killbill.catalog.uri=file:///Users/stephanebrossier/Work/Src/Killbill/killbill/server/src/main/resources/NingCatalog.xml
-killbill.overdue.uri=file:///Users/stephanebrossier/Work/Src/Killbill/killbill/server/src/main/resources/OverdueConfig.xml
-
-com.ning.jetty.jdbi.url=jdbc:mysql://127.0.0.1:13306/irs_xna
-com.ning.jetty.jdbi.user=irs_xna
-com.ning.jetty.jdbi.password=irs_xna
+# Use skeleton properties for server and configure killbill database
+com.ning.jetty.jdbi.url=jdbc:mysql://127.0.0.1:3306/killbill
+com.ning.jetty.jdbi.user=root
+com.ning.jetty.jdbi.password=root
user.timezone=UTC
ANTLR_USE_DIRECT_CLASS_LOADING=true
-
-killbill.billing.util.notificationq.notification.off=true
-killbill.billing.util.persistent.bus.off=true
-killbill.server.multitenant=false
-com.ning.billing.osgi.bundles.jruby.conf.dir=/Users/stephanebrossier/Work/Src/Killbill/killbill/server/src/main/resources
