rebasing
todo
tooltip zindex
social bar z-index
css changes
merge after rebase
Merge pull request #50 from juancjara/development

Development
Merge pull request #51 from andreqi/master

minor view changes
Merge pull request #52 from juancjara/master

update dev