add skylight in production
Merge branch 'master' into heroku

Conflicts:
	Gemfile