Merge pull request #86 from raviosc/developer125

Developer125
test
changes done by dev119
Merge pull request #87 from raviosc/developer119

Developer119
Validation html
Merge remote-tracking branch 'origin/master'