bug 569: small typo fix
bug 1008: changed include to require and path
bug 1008: removed blank
Merge branch 'bug-1008' into testserver-stable
bug 1008: changed query and user output
bug 1008: changed user output
Merge branch 'bug-569' into testserver-stable
bug 1008: changed text indentation
Merge branch 'bug-1008' into testserver-stable
bug 569: changed wording of output
bug 1008: Fixed typo  in sql-query
Merge branch 'bug-569' into testserver-stable
Merge branch 'bug-1008' into testserver-stable