Upgrade Ruby to 2.1.3
Fix bootstrap-sockets missing assets
Add javascript includes back into application layout
Merge pull request #1 from allolex/develop

Add changes we worked on together