Added missing Files after an incomplete Merge (Tree Conflict Error) by Hand (Export from Branch "dev1") to the Trunk.
Authored by: wellgis 2014-02-19
Parent: [r476]
Child: [r478]