@@ -222,7 +222,7 @@ tests:
 	@echo "Autobuild-tests for ZWave network finished."
 
 autobuild-tests:
-	$(NOSE) $(NOSEOPTS) tests/lib/autobuild tests/api/autobuild tests/manager/autobuild
+	$(NOSE) $(NOSEOPTS) tests/lib/autobuild tests/api/autobuild tests/manager/autobuild tests/web/autobuild
 	@echo
 	@echo "Tests for ZWave network finished."
 
 
@@ -45,29 +45,29 @@
   version = pyozw_version,
   zip_safe = False,
   package_dir = {'' : 'src-web' },
-  packages = find_packages('src-web', exclude=["scripts"]),
+  packages = find_packages('src-web', exclude=["scripts", "libraries"]),
   install_requires = [
                      'openzwave == %s' % pyozw_version,
                      'Flask == 0.10.1',
                      'Flask-WTF == 0.9.5',
                      'Babel >= 1.0',
                      'Flask-Babel == 0.9',
-                     'Flask-Fanstatic == 0.2.0',
-                     'fanstatic',
+                     #'Flask-Fanstatic == 0.2.0',
+                     #'fanstatic',
                      #'js.bootstrap >= 3.3.1',
-                     'js.jquery >= 1.9.1',
+                     #'js.jquery >= 1.9.1',
                      #'js.jquery_timepicker_addon >= 1.3',
-                     'js.jquery_datatables >= 1.10',
+                     #'js.jquery_datatables >= 1.10',
                      'Flask-Themes >= 0.1.3',
                      'WebOb >= 1.4',
                      'Jinja2 >= 2.5.5',
                      'gevent-socketio >= 0.3.6',
                      'Flask-SocketIO >= 0.6.0',
-                     'js.socketio < 1.0.0',
+                     #'js.socketio < 1.0.0',
                      'PyYAML >= 3.10',
                     ],
   #include_package_data=True,
   package_data={
-    'pyozwweb': ['app/static/*/*', 'app/templates/*', 'app/templates/*/*'],
+    'pyozwweb': ['app/static/*', 'app/static/*/*', 'app/static/*/*/*', 'app/templates/*', 'app/templates/*/*'],
   },
 )
@@ -42,7 +42,7 @@
 from flask import Flask, current_app, render_template, session, request
 from flask.ext.socketio import SocketIO, emit, join_room, leave_room, close_room, disconnect
 
-from flask_fanstatic import Fanstatic
+#from flask_fanstatic import Fanstatic
 #from flask.ext.sqlalchemy import SQLAlchemy
 
 from openzwave.network import ZWaveNetwork
@@ -133,8 +133,8 @@ def create_app(config_object='pyozwweb.config.DevelopmentConfig'):
     if settings.has_option(section, 'port'):
         app.config['PORT'] = settings.getint(section, 'port')
     #Flask stuff
-    global fanstatic
-    fanstatic = Fanstatic(app)
+    #global fanstatic
+    #fanstatic = Fanstatic(app)
     global socketio
     socketio = SocketIO(app)
     if not app.config['DEBUG']: