MAJ-1097: change geomajasContext.xml to specific files
Merge branch 'MAJ-1097' into magdageo
MAJ-1097: change geomajasWebContext.xml importing
Merge branch 'MAJ-1097' into magdageo