Pushed all ClientSide to master branch, excluding spec folder, cause it needs to be re-factored first