Modifs t.llfr
Merge branch 'torquebox' of https://github.com/zorel/olccs-rails into torquebox

Conflicts:
	Gemfile
Merge branch 'master' into torquebox
Figaro #1
Stuff