Parse Library
Merge branch 'master' of https://github.com/leomindez/Amigos

Conflicts:
	AmigosApp/app/app.iml
	AmigosApp/app/build.gradle