favicon and EOL fix
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop

Conflicts:
	app/assets/javascripts/setup.coffee
	app/views/comments/create.js.erb
	app/views/comments/destroy.js.erb