Updates in qml and site
Merge pull request #29 from diegosarmentero/develop

Updates in qml and site