#15: Updating code with Master
Merge pull request #29 from dotCMS/issue-15-vanity-url

#15: Updating code with Master