Move resources
Update client
Update test
delete duplicated files
Merge branch 'master' of github.com:sydlawrence/HACKBOURNEMOUTH