commit final arnau
Merge remote-tracking branch 'origin/master'

Conflicts:
	virtualtrade-android/assets/config.properties