Update documentation after adding new 'alwaysShowVScroll' and 'always…

…ShowVScroll' settings in merge

settings.html

@@ -129,6 +129,16 @@ <h2 id="horizontalGutter">horizontalGutter <span class="setting-type">- int (def
 			<p>
 				The amount of space between the bottom of the content and the horizontal scrollbar.
 			</p>
+			<h2 id="alwaysShowHScroll">alwaysShowHScroll <span class="setting-type">- boolean (default false)</span></h2>
+			<p>
+				If this is set to 'true' then Horizontal Scrollbar will be always be shown. This is not default behaviour.
+				Default is that scrollbar is showed automatically.
+			</p>
+			<h2 id="alwaysShowVScroll">alwaysShowVScroll <span class="setting-type">- boolean (default false)</span></h2>
+			<p>
+				If this is set to 'true' then Vertical Scrollbar will be always be shown. This is not default behaviour.
+				Default is that scrollbar is showed automatically.
+			</p>
 			<h2 id="mouseWheelSpeed">mouseWheelSpeed <span class="setting-type">- int (default 10)</span></h2>
 			<p>
 				A multiplier which is used to control the amount that the scrollpane scrolls each time the mouse wheel
@@ -199,4 +209,4 @@ <h2 id="trackClickRepeatFreq">trackClickRepeatFreq <span class="setting-type">-
 
 		</div>
 	</body>
-</html>
+</html>