Merge branch 'develop' into help_develop

Conflicts:
	.gitignore

3 files changed, 19 insertions, 4 deletions

diff --git a/core/lib/leap_web_core.rb b/core/lib/leap_web_core.rb
index 16004f8..8826880 100644
--- a/core/lib/leap_web_core.rb
+++ b/core/lib/leap_web_core.rb
@@ -1,5 +1,12 @@
+require "rails"
+
+require "couchrest"
+require "couchrest_model"
+require "couchrest_session_store"
+
+require "json"
+
 require "extensions/testing"
-require "leap_web_core/dependencies"
 require "leap_web_core/engine"
 
 module LeapWebCore
diff --git a/core/lib/leap_web_core/ui_dependencies.rb b/core/lib/leap_web_core/ui_dependencies.rb
new file mode 100644
index 0000000..e0a0b86
--- /dev/null
+++ b/core/lib/leap_web_core/ui_dependencies.rb
@@ -0,0 +1,11 @@
+require "haml"
+require "bootstrap-sass"
+require "jquery-rails"
+require "simple_form"
+
+if Rails.env == "development"
+  require "haml-rails"
+  require "sass-rails"
+  require "coffee-rails"
+  require "uglifier"
+end
diff --git a/core/lib/leap_web_core/version.rb b/core/lib/leap_web_core/version.rb
deleted file mode 100644
index 6a34982..0000000
--- a/core/lib/leap_web_core/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module LeapWebCore
-  VERSION = "0.0.1"
-end