Merge remote-tracking branch 'remotes/origin/devel' into feature-encyclopedia

android/assets/font/Roboto-Bold_35.ttf

android/assets/font/Roboto-Bold_40.ttf

android/assets/font/Roboto-Bold_45.ttf

android/assets/font/Roboto-Bold_50.ttf

android/assets/font/Roboto-Bold_55.ttf

android/assets/font/Roboto-Regular_35.ttf

android/assets/font/Roboto-Regular_40.ttf

android/assets/font/Roboto-Regular_45.ttf

android/assets/font/Roboto-Regular_50.ttf

android/assets/font/Roboto-Regular_55.ttf

android/assets/gfx/button/closebutton_pressed.png

android/assets/gfx/button/closebutton_unpressed.png

...assets/gfx/button/tablexiabutton_blank_blue_pressed.9.png

...sets/gfx/button/tablexiabutton_blank_blue_solarized.9.png

...sets/gfx/button/tablexiabutton_blank_blue_unpressed.9.png

...ssets/gfx/button/tablexiabutton_blank_green_pressed.9.png

...ets/gfx/button/tablexiabutton_blank_green_solarized.9.png

...ets/gfx/button/tablexiabutton_blank_green_unpressed.9.png

.../assets/gfx/button/tablexiabutton_blank_red_pressed.9.png

...ssets/gfx/button/tablexiabutton_blank_red_solarized.9.png