Merge pull request #1 from asm-products/feature/bulk-import-employees

Feature/bulk import employees
Update .form-description font styles
Merge pull request #8 from kbjohnson90/patch-1

Update .form-description font styles
Set up Mailer for sending notices to employees/contractors

Set up Mailer for sending notices to employees/contractors
Merge branch 'master' of https://github.com/rafaelb/zenforms into rafaelb-master

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/employee.rb
	app/views/employees/_employee.html.erb
	app/views/employees/import.html.erb
Merge branch 'master' of github.com:asm-products/zenforms into rafaelb-master