Merge branch 'master' of https://github.com/Astonex/Antox
Merge branch 'master' of https://github.com/Astonex/Antox
Update ActionBar with new color scheme
Merge branch 'Proplex-master'