Merge branch 'RefactorPrint'

- Modifies printing model to be similar to glabels-3.x.
   - Allow simple projects to print by-the-page (#51)
   - Added collated vs uncollated document merges
- Added ability to separate merge groups by page
- Updated man pages
- Updated misc developer documentation

user-docs/man/glabels-qt.rst

@@ -17,30 +17,30 @@ OPTIONS
 -------
 
 .. program:: glabels-qt
-	     
+
 .. option::  -h, --help
-	     
+
 	     Displays usage information and exits.
-	     
+
 .. option::  -v, --version
-	     
+
              Displays version information and exits.
 
 FILES
 -----
 
 .. describe:: ${prefix}/share/glabels-qt/templates/
-	      
+
 	      Directory containing predefined product templates distributed with glabels.
-	  
+
 .. describe:: ${XDG_CONFIG_HOME}/glabels.org/glabels-qt/
-	      
+
 	      Directory containing user defined product templates created with the
 	      gLabels Product Template Designer.  **Do not place manually created
 	      templates here!**
-	  
+
 .. describe:: ${HOME}/.glabels/
-	      
+
               Directory for manually created product templates.
 
 REPORTING BUGS
@@ -53,5 +53,5 @@ SEE ALSO
 --------
 
 :manpage:`glabels-batch-qt(1)`
-	 
+
 The gLabels homepage at <http://glabels.org/>.