fixing things to get gson to work
Language selection
Merge branch 'details' into dev

Conflicts:
	app/build.gradle