diff --git a/docs/client/CrashAddresses.md b/docs/client/CrashAddresses.md
index 35a73d9bc..f80c76972 100644
--- a/docs/client/CrashAddresses.md
+++ b/docs/client/CrashAddresses.md
@@ -24,4 +24,4 @@ The below table lists some common client crash addresses which you can use to he
| Exception 0x0000005 at 0x534134 | Issue with Windows 7 / Vista Access levels | Running SA:MP as administrator appear to fix it. |
| Exception 0xC0000005 at 0x544BC8 | See 0x00544BC8 | See 0x00544BC8 |
| Exception 0xC0000005 at 0x536DF4 | See 0x00544BC8 | See 0x00544BC8 |
-| Exception 0xC0000005 at 0x7F120E | Invalid vehicle upgrade applied | [See here](CommonIssues) |
+| Exception 0xC0000005 at 0x7F120E | Invalid vehicle upgrade applied | [See here](CommonClientIssues) |
diff --git a/docs/client/sa-mp.cfg.md b/docs/client/sa-mp.cfg.md
new file mode 100644
index 000000000..b0e2fc98c
--- /dev/null
+++ b/docs/client/sa-mp.cfg.md
@@ -0,0 +1,25 @@
+---
+title: sa-mp.cfg
+description: sa-mp client configuration file.
+---
+
+## Description
+
+`sa-mp.cfg` is a client configuration file which allows you to change settings related to SA-MP. This file is found in your 'My Documents\\GTA San Andreas User Files\\SAMP' folder, under your Windows user account. This file can be edited with a text editor such as notepad.
+
+## Options
+
+| Option | Description |
+|---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **pagesize** | This allows players to set the number of lines displayed in the chat window. It may be set between 10 and 20 lines. The default is 10 lines. This option can be set in-game using the client-side /pagesize command. |
+| **fpslimit** | This allows players to set a specific [FPS](http://en.wikipedia.org/wiki/Frame_rate "http://en.wikipedia.org/wiki/Frame_rate") limit, when the frame limiter option is enabled in the GTA:SA menu. Values accepted are 20 to 90. The default set by SA-MP is 50. This option can be changed in-game with the client-side /fpslimit command. |
+| **disableheadmove** | This option controls whether player's heads move in the direction they are looking. 1 disables head movements, 0 enables it. This option can be toggled in-game with the client-side /headmove command. |
+| **timestamp** | This allows players to show a local timestamp at the side of chat messages. 1 enables timestamps, and 0 disables them. This can be toggled in-game using the client-side /timestamp command. |
+| **ime** | This controls whether the chat window input supports Input Method text editing and language switching. 1 enables IME, 0 disables it. |
+| **multicore** | Toggle whether the SA-MP client uses multiple CPU cores when running. Default is 1 (DOES use multiple CPU cores). Set to 0 if you experience mouse problems. |
+| **directmode** | This allows players with chat text drawing problems to use the slower direct-to-screen text rendering mode. 0 to disable, 1 to enable. |
+| **audiomsgoff** | If this option is set to 1, no 'Audio Stream: \[URL\]' messages will be displayed in the chat window when the server plays an audio stream. This option can be toggle in-game using the client-side /audiomsg command. |
+| **audioproxyoff** | If this option is set to 1, and there is a proxy server set in your Windows Internet Options, the proxy will not be used when playing audio streams in SA-MP. |
+| **nonametagstatus** | If this option is set to 0, players will see an hourglass icon next to other players' nametags when they are paused. This is enabled (0) by default. This option can be changed in-game using the client-side /nametagstatus command. |
+| **fontface** | Allows you to change the font of chat, dialogs and the scoreboard. _i.e. fontface="Comic Sans MS"_. Not officially supported, and may cause problems. |
+| **fontweight** | This option toggles whether your chat font is bold or not. **0 = BOLD (default) and 1 = NORMAL.** |
diff --git a/docs/scripting/functions/GetPlayerMarkerForPlayer.md b/docs/scripting/functions/GetPlayerMarkerForPlayer.md
new file mode 100644
index 000000000..da81b1ef0
--- /dev/null
+++ b/docs/scripting/functions/GetPlayerMarkerForPlayer.md
@@ -0,0 +1,38 @@
+---
+title: GetPlayerMarkerForPlayer
+description: Get the colour of a player's nametag and radar blip for another player.
+tags: ["player"]
+---
+
+
+
+## Description
+
+Get the colour of a player's **nametag** and **radar blip** for another player.
+
+| Name | Description |
+| -------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
+| playerid | The player that can see the player's changed blip/nametag colour | |
+| targetid | The player whose colour has been changed. |
+
+## Returns
+
+The target player's **nametag** and **radar blip** colour.
+
+## Examples
+
+```c
+// Make player 42 see player 1 as a red marker
+SetPlayerMarkerForPlayer(42, 1, 0xFF0000FF);
+
+new markerColour = GetPlayerMarkerForPlayer(42, 1);
+// markerColour = 0xFF0000FF
+```
+
+## Related Functions
+
+- [ShowPlayerMarkers](ShowPlayerMarkers): Decide if the server should show markers on the radar.
+- [LimitPlayerMarkerRadius](LimitPlayerMarkerRadius): Limit the player marker radius.
+- [SetPlayerColor](SetPlayerColor): Set a player's color.
+- [ShowPlayerNameTagForPlayer](ShowPlayerNameTagForPlayer): Show or hide a nametag for a certain player.
+- [SetPlayerMarkerForPlayer](SetPlayerMarkerForPlayer): Set a player's marker for a specific player.
diff --git a/docs/translations/bs/scripting/functions/GetPlayerMarkerForPlayer.md b/docs/translations/bs/scripting/functions/GetPlayerMarkerForPlayer.md
new file mode 100644
index 000000000..4484f9a80
--- /dev/null
+++ b/docs/translations/bs/scripting/functions/GetPlayerMarkerForPlayer.md
@@ -0,0 +1,38 @@
+---
+title: GetPlayerMarkerForPlayer
+description: Dobij boju igračovog nametag-a i radara za drugog igrača.
+tags: ["player"]
+---
+
+
+
+## Deskripcija
+
+Dobij boju igračovog **nametag-a** i **radara** za drugog igrača.
+
+| Ime | Deskripcija |
+| -------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
+| playerid | Igrač koji može vidjeti igračevu promijenjenu boju blipa/nametag-a |
+| targetid | Igrač čija je boja promijenjena. |
+
+## Return-ovi
+
+Boja **nametag-a** i **radara** target igrača.
+
+## Primjeri
+
+```c
+// Napraviti da igrač 42 vidi igrača 1 kao crveni marker
+SetPlayerMarkerForPlayer(42, 1, 0xFF0000FF);
+
+new markerColour = GetPlayerMarkerForPlayer(42, 1);
+// markerColour = 0xFF0000FF
+```
+
+## Srodne Funkcije
+
+- [ShowPlayerMarkers](ShowPlayerMarkers): Odluči da li server treba da prikazuje markere na radaru.
+- [LimitPlayerMarkerRadius](LimitPlayerMarkerRadius): Ograniči radijus markera igrača.
+- [SetPlayerColor](SetPlayerColor): Postavi boju igrača.
+- [ShowPlayerNameTagForPlayer](ShowPlayerNameTagForPlayer): Prikaži ili sakrij nametag određenog igrača.
+- [SetPlayerMarkerForPlayer](SetPlayerMarkerForPlayer): Postavi marker igrača za određenog igrača.
diff --git a/docs/tutorials/PortForwarding.md b/docs/tutorials/PortForwarding.md
new file mode 100644
index 000000000..e7771d968
--- /dev/null
+++ b/docs/tutorials/PortForwarding.md
@@ -0,0 +1,72 @@
+---
+title: Port Forwarding
+description: Server port forwarding tutorial.
+---
+
+**Welcome to the Port Forward tutorial!**
+
+So, you have arrived to the Port Forward tutorial, made by Leopard.
+
+All you need is a samp-server or omp-server and a router. If you have not a router, then you don't need to port forward!
+
+## The Start
+
+Ok, so here's the start, start off by finding your **gateway**. Assume that you have vista. Click start, click on the search field, and write **cmd**. Then a black box appears. Enter the following; **ipconfig**. Wait for the text to load, then look though it. Keep searching until you find _**gateway**_, and don't close the black box!
+
+When you have found it, open your favorite web browser. When it's loaded, head over to the adress bar and type in the _**gateway**_ value (example: 192.168.0.1/192.168.1.1). Press enter.
+
+## Router Configuration
+
+Well done, you've made it to the router's configuration page. What we've got left to do is port forward now.
+
+So.. there are a category in that page that is named one of the followings;
+
+- Virtual Server
+- Port Forwarding
+- Port Control
+- Application Sharing
+- Anything with `port` in its name.
+
+If you have found it, click on it. Then, click the 'Add new', 'New Port' or some else button that will toggle opening a new port.
+
+Enter the following details:
+
+```
+Port: YOUR_PORT (standard: 7777)
+Port Type: UDP
+Enabled: Yes
+**IP: Continue the 3rd Step**
+```
+
+Now you need to know your computer IP address.
+
+## Getting the IP, Continuing
+
+Now, maximize the black box and look though the text again, until you see _IPv4_. It should be in a format like this: **192.168.0.100**. Copy it, and there you have it! Continue with the Information in the router's homepage. For example, my ip is 192.168.0.100
+
+```
+Port: YOUR_PORT (standard: 7777)
+Port Type: UDP
+Enabled: Yes
+IP: 192.168.0.100
+```
+
+And press **save**. Then your done. AND! Don't forget to **port forward in Windows Firewall**. This is a little tutorial;
+
+Go to the start menu, enter "firewall" in the search field and select the "Windows Firewall". Open it and click _Change preferences_. New window pop-up. Click the _Exceptions_ tab, click the _Add port.._ and then fill in this information;
+
+```
+Name: SA-MP Server (name it whatever you want)
+Port Number: YOUR_PORT (standard: 7777)
+Protocol: UDP
+```
+
+Then your done! Click ok and close it. Launch the server, and see if its working. If it is, go to your SA-MP Client and enter: localhost:YOUR_PORT(standard: 7777). If the ping changes, then your server is working fully. Now you just need to go to:
+
+[WhatIsMyIP.COM](http://whatismyip.com).
+
+## The finish
+
+Once there, get the ip that is on your screen. Go again to your SA-MP Client, add that ip to your favorites and add YOUR_PORT (standard: 7777) at the end. If its working,
+
+**CONGRATULATIONS**! _You have port-forwarded_!