adding field for glossary extension in questionViews
adding glossaryText field in {}Question classes
more view inflators for secondary text field
new layout for star_rating questions with glossary extension
new layout for {}questions with glossary extension
adding onClick methods in {}QuestionsViewAdapter to allow switching glossary on and off
Merge branch 'develop' of https://github.com/daydreaming-experiment/app into feature/glossary
Merge branch 'develop' into feature/glossary
adding drawable to be changed
layout for glossary activity
adding glossary class and activity
add glossary button and link to dashboard
parameter loading for glossary + strings + manifest
final changes for test of glossary
updating urls
adding fromJson with Type
updating parsing of glossary as HashMap
layouts, fonts in activity, drawable -> changes after discussion with gislain
Merge branch 'develop' into feature/gislain3sept
changing parsing functions from json, creating glossary activity correctly, small function layout updates