Merge pull request #35 from adamarla/master

Correction to js
Added a method - uid - for backward compatibility
Merge branch 'master' of github.com:abhinavc/web-application
Merge remote-tracking branch 'heroku/master'