6.audioLocal: hem fet streaming de audio desde java i al web server
Merge branch 'master' of github.com:aaltes/viubateaHibridApp

Conflicts:
	assets/www/index.html
	bin/classes/com/turismebatea/MainActivity$1$1.class
	bin/classes/com/turismebatea/MainActivity$1.class
	bin/classes/com/turismebatea/MainActivity$2.class
	bin/classes/com/turismebatea/MainActivity$3.class
	bin/classes/com/turismebatea/MainActivity$4$1.class
	bin/classes/com/turismebatea/MainActivity$4.class
	bin/classes/com/turismebatea/MainActivity$PlaceholderFragment.class
	bin/classes/com/turismebatea/MainActivity.class