Move resources
Update client
Update test
delete duplicated files
Merge branch 'master' of github.com:sydlawrence/HACKBOURNEMOUTH
moved controller over into bridge
Merge branch 'master' of https://github.com/sydlawrence/HACKBOURNEMOUTH
Added message proxy
Merge remote-tracking branch 'syd/master'
Added id for controllers