Fixed merge conflicts, reverting files to before update of grunt-dox and dox-foundation