New model names half working in views...
Cleanup to adapt new model names and functions...
Added loan
Merge branch 'ux' into parser

Conflicts:
	test/fabricators/loan_fabricator.rb
	test/models/loan_test.rb
Another cleanup =)
Merge branch 'ux' into parser
Added loan to parser