Merge remote-tracking branch 'origin/master'

frontend/web/.htaccess

 RewriteEngine On
 RewriteBase /
 
-RewriteCond %{HTTP_HOST}	^www\.(.*)	[NC]
-RewriteRule ^(.*)$ http://%1/$1	[R=301,L]
+RewriteCond %{HTTP_HOST} ^www.task-on\.com$ [NC]
+RewriteRule ^(.*)$ http://task-on.com/$1 [R=301,L]
+
+RewriteCond %{HTTP_HOST}        ^www\.(.*)      [NC]
+RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
 
 RewriteCond %{HTTPS} off
 RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R,L]
 
-RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_URI} ^(.+)/$
+RewriteRule ^(.+)/$ https://task-on.com/$1 [R=301,L]
 
-RewriteRule . index.php
+Redirect 301 /portfolio/appl  /portfolio
 
-RewriteCond %{REQUEST_URI} /index.php
-RewriteCond %{QUERY_STRING} ^\z
-RewriteRule ^(.*)$ https://task-on.com/? [R=301,L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . index.php
 
 <IfModule mod_expires.c>
   <FilesMatch \.(gif|png|jpg|jpeg|ogg|mp4|mkv|flv|swf|wmv|asf|asx|wma|wax|wmx|wm)$>
@@ -29,4 +33,4 @@ RewriteRule ^(.*)$ https://task-on.com/? [R=301,L]
   </FilesMatch>
   ExpiresByType text/css "access plus 1 year"
   ExpiresByType application/javascript "access plus 1 year"
-</IfModule>
+</IfModule>                         
\ No newline at end of file