wip
Merge branch 'master' of github.com:neuling/Walls.io-Widget

Conflicts:
	src/assets/javascripts/application.coffee
	src/assets/javascripts/wallsio.jquery.coffee
gulfile.js in coffee (party)!