Fixed ps-printer-ps_con_info relationship
Layouts changes because of new relationships
Just gonna revert it
Revert "Fixed ps-printer-ps_con_info relationship"

This reverts commit 3cd1b881df9f5736e69b0f0700907b97f905761a.
commit it
Merge branch 'print_stations' of https://github.com/DCUnit711/ep into print_stations

Conflicts:
	app/views/layouts/_ps_connection_information.html.haml
	app/views/printers/index.html.haml
	app/views/ps_connection_informations/show.html.haml
Commit
What is happening
ugh
Revert 7b7c5b9..c17513a

This rolls back to commit 7b7c5b9a1ea76cbe246cdd9ea22865320c6e4f51.
Fixed Welcome Page
Merge branch 'print_stations' into development