commit test
Merge branch 'master' of https://github.com/frank0ch0a/SCA

Conflicts:
	bin/classes/org/sca/sca/R$color.class
	bin/classes/org/sca/sca/R$dimen.class
	bin/classes/org/sca/sca/R$drawable.class
	bin/classes/org/sca/sca/R$id.class
	bin/classes/org/sca/sca/R$layout.class
	bin/classes/org/sca/sca/R$menu.class
	bin/classes/org/sca/sca/R$string.class
	bin/classes/org/sca/sca/R$style.class
	bin/classes/org/sca/sca/controllers/RegionsDetailFragment.class