Added controls to sort the machine and container tokens.
Merge pull request #526 from huwshimi/token-sorting

Token sorting

Added sorting of machine and container tokens in the machine view.