fix
Merge branch 'master' of https://github.com/elena-mellano/Gnammo2

Conflicts:
	.idea/libraries/support_v4_19_1_0.xml
	app/app.iml