Merge branch 'master' of https://github.com/camposcristian90/AAC_Mobile

Conflicts:
	README.md