Added new alias manager package, tweaked html to match.
Merge branch 'dev'

Merging recent Alias Manager change to master from dev.