Escaping single quotes
Removed updates
Fixing ordering of client scripts
Merge pull request #13 from anas-ambri/Gabriel

Gabriel
Merging with master