Glue the db
Merge remote-tracking branch 'github/master'

Conflicts:
	Gemfile.lock
Merge remote-tracking branch 'github/master'