Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop

include/openspace/rendering/renderableplane.h

@@ -59,6 +59,7 @@ private:
 	void loadTexture();
 
 	properties::StringProperty _texturePath;
+	properties::BoolProperty _billboard;
 
 	glm::vec2 _size;
 	Origin _origin;

include/openspace/scripting/scriptengine.h

@@ -42,6 +42,7 @@ public:
 		struct Function {
 			std::string name;
 			lua_CFunction function;
+			std::string argumentText;
 			std::string helpText;
 		};
         std::string name;