hard coded URLs correction
Task list added
Merge