Added the new printer on floor 6 in the edit-building
Added paper size option
Added media option to printer function and lpr-command
Added ppi option
Added ppi option to printer function
Merge branch 'patch-1' of github.com:raksooo/wordpress into raksooo-patch-1

* 'patch-1' of github.com:raksooo/wordpress:
  Added ppi option to printer function
  Added ppi option
  Added media option to printer function and lpr-command
  Added paper size option
  Added the new printer on floor 6 in the edit-building

Conflicts:
	lib/inc.print.php
Merge branch 'raksooo-patch-1' into develop

* raksooo-patch-1:
  Added ppi option to printer function
  Added ppi option
  Added media option to printer function and lpr-command
  Added paper size option
  Added the new printer on floor 6 in the edit-building
Merge branch 'develop'

* develop:
  Added ppi option to printer function
  Added ppi option
  Added media option to printer function and lpr-command
  Added paper size option
  Added the new printer on floor 6 in the edit-building