Merge com.sanjay900.PortalStick and de.V10lator.PortalStick.

Signed-off-by: V10lator <v10lator@myway.de>
I hate conflicts...

Signed-off-by: V10lator <v10lator@myway.de>