Signed-off-by: BienveFdez <bienve_fdez@hotmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/values/colors.xml