Add more EventBus functionality
Change ItemSelected params
Fix some bugs
Merge remote-tracking branch 'origin/master'