Updated the aliases file
Merge branch 'dev' of https://github.com/totteCh/B17 into dev