Permisos añadidos
Add
Merge branch 'master' of https://github.com/MrFeedProject/MrFeed.git

Conflicts:
	MrFeed2/AndroidManifest.xml
	MrFeed2/bin/AndroidManifest.xml
	MrFeed2/bin/MrFeed2.apk
	MrFeed2/bin/classes.dex
	MrFeed2/bin/resources.ap_
	MrFeed2/gen/com/example/mrfeed2/R.java
	MrFeed2/res/values/strings.xml