Re-design game slot & game slot container
Merge branch 'master' of https://github.com/tvbarthel/Adaptilo

Conflicts:
	Android/app/src/main/res/layout/fragment_basic_controller.xml