Merge pull request #24 from AADOJ/Sisso

Sisso
Revert "Sisso"
Merge pull request #25 from AADOJ/revert-24-Sisso

Revert "Sisso"
fuu
Merge branch 'master' into develop
Merge pull request #38 from AADOJ/OMAR

Omar
Merge pull request #39 from AADOJ/develop

Develop
Added heroku setting to build.gradle and system.properties
Added heroku setting to Procfile
bugs in gui fixed
get me new version
get me nw master
fixing minor bugs in GUI
Auto merge
Merge branch 'master' of github.com:AADOJ/Late-Term-Assignment
Changed install location dir for installApp task
Modified .travis.yml for continous delivery on heroku, deploys only on master branch
seleniumTests included in build process
Auto merge
Merge pull request #41 from AADOJ/GGJ

Ggj