Mini fixes
Merge branch 'master' of github.com:francocatena/ignite

Conflicts:
	Gemfile.lock