Merge pull request #567 from ToniMontana/hotfix-content-list

[FIX] Index may not be less than 0
Merge pull request #566 from ToniMontana/hotfix-directory-bug

[FIX] Directory: AddTo() needs to call ClearUrl()
Merge remote-tracking branch 'origin/master' into tonimontana-modifications