compass and grunt can now be used to build scss files
Merge branch 'master' into web-client
added api to the web-client