Merge branch 'WIP2' into WIP

Conflicts:
	SavvyCAN.pro
	config.h
	mainwindow.cpp
	mainwindow.h
	mainwindow.ui

Resolved conflicts between branches

SavvyCAN.pro

@@ -6,11 +6,11 @@
 
 QT       += core gui
 
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets serialport printsupport network
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets serialport printsupport qml
 
 CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
 
-CONFIG += c++11
+CONFIG += c++11 qscintilla2
 
 TARGET = SavvyCAN
 TEMPLATE = app
@@ -37,7 +37,11 @@ SOURCES += main.cpp\
     mainsettingsdialog.cpp \
     firmwareuploaderwindow.cpp \
     discretestatewindow.cpp \
-    connectionwindow.cpp
+    connectionwindow.cpp \
+    scriptingwindow.cpp \
+    scriptcontainer.cpp \
+    canfilter.cpp \
+    rangestatewindow.cpp
 
 HEADERS  += mainwindow.h \
     can_structs.h \
@@ -63,7 +67,11 @@ HEADERS  += mainwindow.h \
     mainsettingsdialog.h \
     firmwareuploaderwindow.h \
     discretestatewindow.h \
-    connectionwindow.h
+    connectionwindow.h \
+    scriptingwindow.h \
+    scriptcontainer.h \
+    canfilter.h \
+    rangestatewindow.h
 
 FORMS    += mainwindow.ui \
     graphingwindow.ui \
@@ -79,7 +87,9 @@ FORMS    += mainwindow.ui \
     mainsettingsdialog.ui \
     firmwareuploaderwindow.ui \
     discretestatewindow.ui \
-    connectionwindow.ui
+    connectionwindow.ui \
+    scriptingwindow.ui \
+    rangestatewindow.ui
 
 DISTFILES +=