Add jshint for client and server. Satisfy jshint.
Merge pull request #15 from martinmicunda/master

Add jshint for client and server. Satisfy jshint.
Fix broken app
Improve build script
Fixing conflicts
fixing merge conflicts
fixing merge