diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 08476c498c8d4f0ab9d6e3697aa8d090eaf40e06..9ba2bd99b48e2bdd0bd28697d05117d082c85a22 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -55,8 +55,8 @@
 		<IfModule mod_ssl.c>
 		SSLEngine on
 		SSLProtocol All -SSLv2 -SSLv3
-		# SSLCipherSuite          ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
-		SSLHonorCipherOrder     on
+		# SSLCipherSuite		 ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
+		SSLHonorCipherOrder	 on
 		# <IfModule mod_headers.c>
 		# Header always add Strict-Transport-Security "max-age=15768000"
 		# </IfModule>
@@ -174,9 +174,9 @@
 				PerlOptions +ParseHeaders
 				Options +ExecCGI
 			</Directory>
-            <Files *.pl>
+			<Files *.pl>
 				SetHandler perl-script
-            </Files>
+			</Files>
 		</IfModule>
 </tmpl_if>
 
@@ -202,7 +202,7 @@
 			Allow from all
 			</tmpl_if>
 		</Directory>
-		ScriptAlias  /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
+		ScriptAlias /cgi-bin/ <tmpl_var name='document_root'>/cgi-bin/
 		<FilesMatch "\.(cgi|pl)$">
 			SetHandler cgi-script
 		</FilesMatch>
@@ -336,36 +336,36 @@
 					Order allow,deny
 					Allow from all
 					</tmpl_if>
-			    </Directory>
+				</Directory>
 				<Directory {tmpl_var name='web_document_root_www'}>
 					<FilesMatch "\.php[345]?$">
-                    <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
-                            <If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
-                                SetHandler php5-fcgi
-                            </If>
-                    <tmpl_else>
-                            SetHandler php5-fcgi
-                    </tmpl_if>
+					<tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+							<If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
+								SetHandler php5-fcgi
+							</If>
+					<tmpl_else>
+							SetHandler php5-fcgi
+					</tmpl_if>
 					</FilesMatch>
 				</Directory>
 				<Directory {tmpl_var name='web_document_root'}>
 					<FilesMatch "\.php[345]?$">
-                    <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
-                            <If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
-                                SetHandler php5-fcgi
-                            </If>
-                    <tmpl_else>
-                            SetHandler php5-fcgi
-                    </tmpl_if>
+					<tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+							<If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
+								SetHandler php5-fcgi
+							</If>
+					<tmpl_else>
+							SetHandler php5-fcgi
+					</tmpl_if>
 					</FilesMatch>
 				</Directory>
-                Action php5-fcgi /php5-fcgi virtual
+				Action php5-fcgi /php5-fcgi virtual
 				Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
 <tmpl_if name='use_tcp'>
-                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization  -pass-header Content-Type    
+				FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization -pass-header Content-Type	
 </tmpl_if>
 <tmpl_if name='use_socket'>
-                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization  -pass-header Content-Type
+				FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization -pass-header Content-Type
 </tmpl_if>
 		</IfModule>
 		<IfModule mod_proxy_fcgi.c>
@@ -373,13 +373,13 @@
 			#ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ fcgi://127.0.0.1:<tmpl_var name='fpm_port'><tmpl_var name='web_document_root'>/$1
 			<Directory {tmpl_var name='web_document_root'}>
 				<FilesMatch "\.php[345]?$">
-                    <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
-                            <If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
-                                    SetHandler "proxy:fcgi://127.0.0.1:<tmpl_var name='fpm_port'>"
-                            </If>
-                    <tmpl_else>
-                            SetHandler "proxy:fcgi://127.0.0.1:<tmpl_var name='fpm_port'>"
-                    </tmpl_if>
+					<tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+							<If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
+									SetHandler "proxy:fcgi://127.0.0.1:<tmpl_var name='fpm_port'>"
+							</If>
+					<tmpl_else>
+							SetHandler "proxy:fcgi://127.0.0.1:<tmpl_var name='fpm_port'>"
+					</tmpl_if>
 				</FilesMatch>
 			</Directory>
 </tmpl_if>
@@ -387,13 +387,13 @@
 			#ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ unix://<tmpl_var name='fpm_socket'>|fcgi://localhost/<tmpl_var name='web_document_root'>/$1
 			<Directory {tmpl_var name='web_document_root'}>
 				<FilesMatch "\.php[345]?$">
-                    <tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
-                            <If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
-                                    SetHandler "proxy:unix:<tmpl_var name='fpm_socket'>|fcgi://localhost"
-                            </If>
-                    <tmpl_else>
-                            SetHandler "proxy:unix:<tmpl_var name='fpm_socket'>|fcgi://localhost"
-                    </tmpl_if>
+					<tmpl_if name='apache_version' op='>=' value='2.4' format='version'>
+							<If "-f %{DOCUMENT_ROOT} . '/' . %{REQUEST_URI}">
+									SetHandler "proxy:unix:<tmpl_var name='fpm_socket'>|fcgi://localhost"
+							</If>
+					<tmpl_else>
+							SetHandler "proxy:unix:<tmpl_var name='fpm_socket'>|fcgi://localhost"
+					</tmpl_if>
 				</FilesMatch>
 			</Directory>
 </tmpl_if>
@@ -409,7 +409,7 @@
 					Order allow,deny
 					Allow from all
 					</tmpl_if>
-			    </Directory>
+				</Directory>
 				<Directory {tmpl_var name='web_document_root_www'}>
 					<FilesMatch "\.php[345]?$">
 						SetHandler hhvm-fcgi
@@ -426,9 +426,9 @@
 						SetHandler hhvm-fcgi
 					</FilesMatch>
 				</Directory>
-                Action hhvm-fcgi /hhvm-fcgi virtual
+				Action hhvm-fcgi /hhvm-fcgi virtual
 				Alias /hhvm-fcgi {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
-                FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket /var/run/hhvm/hhvm.<tmpl_var name='system_user'>.sock -pass-header Authorization  -pass-header Content-Type
+				FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket /var/run/hhvm/hhvm.<tmpl_var name='system_user'>.sock -pass-header Authorization -pass-header Content-Type
 		</IfModule>
 		<IfModule mod_proxy_fcgi.c>
 			<Directory {tmpl_var name='document_root'}/cgi-bin>