#9 and #19: Updating code from 3.0
Merge pull request #21 from dotCMS/issue-9-Navtool-builds

#9 and #19: Updating code from 3.0