Merge branch 'master' into development

madhephaestus · madhephaestus · commit 835ee78ffecb · 2014-09-18T12:40:06.000-04:00
Conflicts:
	javasdk/NRSDK/src/com/neuronrobotics/sdk/config/build.properties
diff --git a/javasdk/NRSDK/src/com/neuronrobotics/sdk/config/build.properties b/javasdk/NRSDK/src/com/neuronrobotics/sdk/config/build.properties
@@ -1,3 +1,4 @@
 app.name=nrsdk
 app.version=3.9.1
-app.javac.version=1.7
+app.javac.version=1.7
+
