Doc
Merge remote-tracking branch 'origin/master'

Conflicts:
	Android MultiPlay/res/values/strings_text_view.xml
	Android
MultiPlay/src/com/android/controllers/custom/CustomFragment.java
	Android
MultiPlay/src/com/android/controllers/custom/Custom_helper_pager.java
	Android
MultiPlay/src/com/android/controllers/help/gamepad/Gamepad_Fragment.java
	Android
MultiPlay/src/com/android/controllers/help/keyboard/Keyboard_Fragment.java
	Android
MultiPlay/src/com/android/controllers/help/mouse/Mouse_Fragment.java
	Android
MultiPlay/src/com/android/controllers/help/steeringwheel/Steeringwheel_Fragment.java
	Android
MultiPlay/src/com/android/controllers/help/touchpad/TouchPad_Fragment.java
	Android MultiPlay/src/com/android/multiplay/HelpActivity.java