gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/0e7c7c3b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4ee57630 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b3cfef70 (commit)



commit 0e7c7c3b4282868cc56b80fc6a320e5b3eae30da
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sat Oct 17 12:51:10 2015 +0100

    Bug 706021 Add Other Account to CSV Transaction Import
    
    This patch adds the option to specify the other account and memo
    when doing a CSV import.

commit 4ee5763075e62b26f1a0c136dd7f3221145f86e6
Author: Rob Gowin <robgowin at gmail.com>
Date:   Mon Nov 30 12:38:42 2015 -0600

    Fix build issues
    
    src/backend/sql/gnc-transaction-sql.cpp:
       Move inclusion of escape.h out of extern "C" block since
       escape.h is now C++ code.
    
    src/backend/xml/gnc-backend-xml.cpp:
       Move inclusion of gnc-pref.s out of extern "C" block since
       gnc-pref.c is still plain C code.



Summary of changes:
 src/backend/sql/gnc-transaction-sql.cpp            |   4 +-
 src/backend/xml/gnc-backend-xml.cpp                |   2 +-
 .../csv-imp/assistant-csv-trans-import.c           | 748 +++++++++++++++++----
 .../csv-imp/assistant-csv-trans-import.glade       | 169 ++++-
 src/import-export/csv-imp/gnc-csv-model.c          | 202 ++++--
 src/import-export/csv-imp/gnc-csv-model.h          |   9 +-
 src/import-export/import-account-matcher.c         |  25 +-
 src/import-export/import-account-matcher.h         |  11 +
 8 files changed, 967 insertions(+), 203 deletions(-)