Merge branch 'financial' into production
financial: issue_138 rails 4