Environment, Remember fix....
Conflicts resolved
Merge branch 'master' of
ssh://git@github.com/AlbertoCejas/GermanLearningUCA.git

Conflicts:
	Tabu/res/values-de/strings.xml