nueva version
Merge branch 'master' of https://github.com/joseberna/PollApp

Conflicts:
	config.xml
se seube nueva version