Rutas relativas
Merge branch 'master' of https://github.com/Benchcamp/benchcamp2014
Merge branch 'master' of https://github.com/Benchcamp/benchcamp2014

Conflicts:
	byorda/reproductor_v2/js/events.js