fx
asd
fix
Merge branch 'master' of https://github.com/Able1991/fssp

Conflicts:
	app/models/debtor.rb
	app/models/request.rb
	db/development.sqlite3
	db/migrate/20140419121728_debtor.rb
	db/schema.rb
a