francesco: BEACON LOGICS
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/src/main/res/layout/activity_splash.xml
	mobile/src/main/res/values/color.xml
Merge remote-tracking branch 'origin/master'
francesco: BEACON LOGICS