Merge branch 'master' into _javascript
gitignore
Se agrego Modal
Tooltip
popover
Affix
Merge branch '_javascript'

Conflicts:
	.gitignore