deleted xhtml slashes
Merge branch 'master' of https://github.com/atorresg/ATG-Bootstraps

Conflicts:
	desktop-std/index.html