Merge remote-tracking branch 'upstream/twrp2.4' into jb-wip

Conflicts:
	data.cpp
	gui/devices/720x1280/res/ui.xml

	modified:   Android.mk
	modified:   data.cpp
	modified:   data.hpp
	modified:   etc/init.rc
	modified:   gui/Android.mk
	modified:   gui/action.cpp
	new file:   gui/blanktimer.cpp
	new file:   gui/blanktimer.hpp
	modified:   gui/button.cpp
	modified:   gui/devices/1024x600/res/ui.xml
	modified:   gui/devices/1024x768/res/ui.xml
	modified:   gui/devices/1280x800/res/ui.xml
	modified:   gui/devices/1920x1200/res/ui.xml
	modified:   gui/devices/2560x1600/res/ui.xml
	modified:   gui/devices/320x480/res/ui.xml
	modified:   gui/devices/480x800/res/ui.xml
	modified:   gui/devices/480x854/res/ui.xml
	modified:   gui/devices/540x960/res/ui.xml
	deleted:    gui/devices/720x1280/res/fonts/Roboto-Condensed-30.dat
	modified:   gui/devices/720x1280/res/images/Thumbs.db
	modified:   gui/devices/720x1280/res/images/back-icon.png
	deleted:    gui/devices/720x1280/res/images/background.jpg
	modified:   gui/devices/720x1280/res/images/checkbox_checked.png
	modified:   gui/devices/720x1280/res/images/checkbox_empty.png
	deleted:    gui/devices/720x1280/res/images/curtain.jpg
	deleted:    gui/devices/720x1280/res/images/exclamation400.png
	modified:   gui/devices/720x1280/res/images/file.png
	modified:   gui/devices/720x1280/res/images/folder.png
	modified:   gui/devices/720x1280/res/images/home-icon.png
	modified:   gui/devices/720x1280/res/images/keyboard1.png
	modified:   gui/devices/720x1280/res/images/keyboard2.png
	modified:   gui/devices/720x1280/res/images/keyboard3.png
	modified:   gui/devices/720x1280/res/images/keyboard4.png
	modified:   gui/devices/720x1280/res/images/medium-button.png
	modified:   gui/devices/720x1280/res/images/menu-button.png
	modified:   gui/devices/720x1280/res/images/minus-button.png
	modified:   gui/devices/720x1280/res/images/plus-button.png
	deleted:    gui/devices/720x1280/res/images/progress-empty.png
	deleted:    gui/devices/720x1280/res/images/progress-fill.png
	modified:   gui/devices/720x1280/res/images/radio_empty.png
	modified:   gui/devices/720x1280/res/images/radio_selected.png
	deleted:    gui/devices/720x1280/res/images/scaled-button.png
	modified:   gui/devices/720x1280/res/images/slideout.png
	modified:   gui/devices/720x1280/res/images/slider-touch.png
	modified:   gui/devices/720x1280/res/images/slider-used.png
	modified:   gui/devices/720x1280/res/images/slider.png
	modified:   gui/devices/720x1280/res/images/sort-button.png
	deleted:    gui/devices/720x1280/res/images/top-bar.png
	modified:   gui/devices/720x1280/res/images/unlock.png
	deleted:    gui/devices/720x1280/res/images/wipe-all-button.png
	modified:   gui/devices/720x1280/res/ui.xml
	modified:   gui/devices/800x1280/res/ui.xml
	modified:   gui/devices/800x480/res/ui.xml
	modified:   gui/fileselector.cpp
	modified:   gui/gui.cpp
	modified:   gui/gui.h
	modified:   gui/listbox.cpp
	modified:   gui/objects.hpp
	modified:   partition.cpp
	modified:   partitionmanager.cpp
	modified:   prebuilt/Android.mk
	new file:   prebuilt/Superuser.apk
	new file:   prebuilt/su
	modified:   recovery.cpp
	modified:   twrp-functions.cpp
	modified:   twrp-functions.hpp
	modified:   twrpTar.cpp
	modified:   twrpTar.hpp
	modified:   variables.h
	gui/devices/720x1280/res/font/
	gui/devices/720x1280/res/images/progress_001.png
	gui/devices/720x1280/res/images/progress_002.png
	gui/devices/720x1280/res/images/progress_003.png
	gui/devices/720x1280/res/images/progress_empty.png
	gui/devices/720x1280/res/images/progress_fill.png
	gui/devices/720x1280/res/images/small-button.png
	gui/devices/720x1280/res/images/top-bar.jpg
Merge branch 'jb-wip' of github.com:tristan202/Team-Win-Recovery-Project into jb-wip

Conflicts:
	gui/devices/720x1280/res/ui.xml

	deleted:    .gitignore
	modified:   gui/devices/720x1280/res/ui.xml
	gui/devices/720x1280/res/font/
	gui/devices/720x1280/res/images/progress_001.png
	gui/devices/720x1280/res/images/progress_002.png
	gui/devices/720x1280/res/images/progress_003.png
	gui/devices/720x1280/res/images/progress_empty.png
	gui/devices/720x1280/res/images/progress_fill.png
	gui/devices/720x1280/res/images/small-button.png
	gui/devices/720x1280/res/images/top-bar.jpg