removed third party projects from repo
ignore composer lock file
moved web services urls to config, removed test echos from models
Fix merge conflicts with master and testing branch