Merge branch 'master' into development
Updated seed with devices and issue received methods
Changes to dev
Working commit
database change
Gemfile changes
Commented out lines
Seeds update
changes
Seed changes
Communicated with SQL Server
Merge branch 'development' of https://github.com/DCUnit711/ep into development

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'seed-update' into development
Fixed Gemfile
Fixed Gemfile.lock
Got things temporarily working
Layout changes
Layout
Better layout in print stations

Also, some bug fixes
Added computer name column to computer