Merge some files to master from joni/hwisky
Merge branch 'master' of github.com:jonikanerva/hwisky

Conflicts:
	app/controllers/home_controller.rb
	config/routes.rb