Added message proxy
Merge remote-tracking branch 'syd/master'
Added id for controllers
Merge remote-tracking branch 'syd/master'
Merging upstream