edited a load of client changes
Merge branch 'master' of https://github.com/miketurbutt/ecostudio