Removed need of dublicate code
Javadoc
Merge branch 'mapEditor' into cardview