Merged version of both ATAL web projects