Merge branch 'master' of github.com:polar/glpf

Conflicts:
	Gemfile
	config/application.rb
	config/environments/production.rb
	config/locales/en.yml