Add type int[] to the HashMap in Map.class and User.class
Change package localisation
Fix invalid path in Ant file build.xml
Merge branch 'TapeLeSlyp' into develop