nuevo media starter.js
nuevo media starter.js
Merge branch 'master' of https://github.com/nRike/CCola-Hangout

Conflicts:
	static/simpleHangoutApp.xml
Merge branch 'master' of https://github.com/nRike/CCola-Hangout

Conflicts:
	static/simpleHangoutApp.xml