Migrates to Rails 3.2.14
Merge branch 'master' of github.com:burisu/sagitta

Conflicts:
	Gemfile.lock
Keeps untouchables relatives to given client