Rebase mess.

gistfile1.txt

pick a46239c GH-123 Added paragraph to testing documentation roughly explaining new testing method with the python setup.py test script and parameter.
pick 1247ddb Update link to project proposal
pick 4674136 GH-467 Addressed feedback from dideler: condensed original 3 examples into one unittest discover example and reworded new example using PyTest.
pick 89fa9b4 gh-#467 removed references to unittest. Fixed spelling of pytest in example.
pick 566d335 gh-#467 added the first section of the QA part, back to the testing page.
pick 906857b GH-123 Added paragraph to testing documentation roughly explaining new testing method with the python setup.py test script and parameter.
pick aad229c GH-467 Addressed feedback from dideler: condensed original 3 examples into one unittest discover example and reworded new example using PyTest.
pick fc2d837 gh-#467 removed references to unittest. Fixed spelling of pytest in example.
pick e9d8470 gh-#467 added the first section of the QA part, back to the testing page.
pick 9522b45 Added naming to popup dialogs in ConfigTool
pick 1e00d43 Close #435 Create HTTP API for controlling Freeseer recording
pick 77a49c6 Updated markdown used in refering to directories.
pick 80dcc86 Replaced references to unittest with pytest
pick 672a41a Replaced references to unittest with pytest
pick ce79615 Update link to project proposal
pick 1217715 Added naming to popup dialogs in ConfigTool
pick 40b13ed Close #435 Create HTTP API for controlling Freeseer recording
pick 095d786 GH-123 Added paragraph to testing documentation roughly explaining new testing method with the python setup.py test script and parameter.
pick 3a33dd6 Update link to project proposal
pick 4b58b8d GH-467 Addressed feedback from dideler: condensed original 3 examples into one unittest discover example and reworded new example using PyTest.
pick a6c6824 gh-#467 removed references to unittest. Fixed spelling of pytest in example.
pick 8ef52bf gh-#467 added the first section of the QA part, back to the testing page.
pick 8d1abfa Added naming to popup dialogs in ConfigTool
pick 4a8cb14 Close #435 Create HTTP API for controlling Freeseer recording
pick 142721d Updated markdown used in refering to directories.
pick 889fde9 GH-467 Added paragraph to testing documentation roughly explaining new testing method with the python setup.py test script and parameter.
pick 90a1653 GH-123 Added paragraph to testing documentation roughly explaining new testing method with the python setup.py test script and parameter.
pick 5a1a1c7 GH-467 Addressed feedback from dideler: condensed original 3 examples into one unittest discover example and reworded new example using PyTest.
pick 3994fb2 Update link to project proposal
pick de10300 gh-#467 removed references to unittest. Fixed spelling of pytest in example.
pick 91379ed gh-#467 added the first section of the QA part, back to the testing page.
pick e2fda9f Added naming to popup dialogs in ConfigTool
pick 957605f Close #435 Create HTTP API for controlling Freeseer recording

# Rebase 04b5896..2afd49e onto 04b5896
#
# Commands:
#  p, pick = use commit
#  r, reword = use commit, but edit the commit message
#  e, edit = use commit, but stop for amending