fix fix 2
Merge branch 'master' of github.com:escotilha/mobile

Conflicts:
	config.xml