*
Merging
Merge branch 'master' of github.com:Lightpower/nfr

Conflicts:
	config/deploy.rb