added payment tyep model
fixed payment module
Merge branch 'master' into development

Conflicts:
	app/models/company.rb
	config/routes.rb
	db/schema.rb