gm03_2_1 start of update
updates to take into account the suggestions made by andre and also added changes so that there is only one import script
tests passing now
Merge branch 'gm03_2_1' into geocat_trunk