removed all the .swn, .swo, .swm, .swp and .orig files from the branch
Merge branch 'master' into develop
corrected fastbill_id field for rails_admin