Merge branch 'master' of https://github.com/federico1525/alloy

Conflicts:
	test/apps/testing/ALOY-895/views/android/index.xml
ALOY-895 update