fix
Merge branch 'master' of github.com:UrbanIF/fasady-if

Conflicts:
	app/assets/javascripts/home.js.coffee