Metadatsa
Merge branch 'master' of https://github.com/ormir/EEFA_App

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources