Merge pull request #163 from cfbarbero/FunctionalTests

Initial Functional tests
Merge pull request #165 from cfbarbero/FunctionalTests

Fixed bug in WebApp functional test