added toolbar functionality
Merge branch 'master' of https://github.com/sla89/WWE.git