Merge branch 'develop' into solarsystem2

Conflicts:
	openspace.cfg
	shaders/generated/constants.hglsl
	src/engine/openspaceengine.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/spicemanager.cpp

scripts/bind_keys.lua

@@ -0,0 +1,21 @@
+
+openspace.clearKeys()
+
+function setEarthAsOrigin()
+	openspace.setOrigin('Earth')
+end
+
+interaction_speed = 2.75
+
+-- Key Bindings
+openspace.bindKey("f1", "setEarthAsOrigin()")
+openspace.bindKey("f2", "openspace.setOrigin('Mercury')")
+openspace.bindKey("f3", "openspace.setPropertyValue('Earth.renderable.enabled', true)")
+openspace.bindKey("f4", "openspace.setPropertyValue('Earth.renderable.enabled', false)")
+openspace.bindKey("f5", "loadKeyBindings()")
+
+
+openspace.bindKey("U", "openspace.distance(-interaction_speed * openspace.dt(), 13.0)")
+openspace.bindKey("J", "openspace.distance(interaction_speed * openspace.dt(), 13.0)")
+
+openspace.bindKey("PRINT_SCREEN", "openspace.takeScreenshot()")

scripts/default_keybinding.lua

@@ -0,0 +1,4 @@
+return {
+	W = function() print("w") end,
+	S = function() print("s") end
+}

scripts/default_startup.lua

@@ -8,3 +8,10 @@ openspace.time.setTime("2007-02-26T17:38:00.00")
 openspace.time.setDeltaTime(10.0)
 -- print(openspace.time.currentTimeUTC())
 
+
+
+function loadKeyBindings()
+	p = openspace.absPath('${SCRIPTS}/bind_keys.lua')
+	dofile(p)
+end
+loadKeyBindings()