Moved mapping tables to each j_mapper class
Merge remote-tracking branch 'origin/master'
Reformatting only