Modifying web
Merge branch 'master' of https://github.com/JordiAranda/bcn-htr-server

Conflicts:
	public/javascripts/script.js