Interfaz Set theory
Merge branch 'master' of https://github.com/chidmdxx/SOFIA

Conflicts:
	SOFIA/res/values-sw600dp/dimens.xml
	SOFIA/res/values-sw720dp-land/dimens.xml
	SOFIA/res/values/dimens.xml
	SOFIA/res/values/strings.xml