Merge con waldix
Merge remote-tracking branch 'origin/refactory' into refactory

Conflicts:
	phonegap/platforms/android/assets/www/app.js
	phonegap/www/app.js
Merge con waldix