removed all the .swn, .swo, .swm, .swp and .orig files from the branch
added fastbill_profile and fastbill_subscrition_id fields for User to rails_admin
Merge branch 'master' into develop