merge in device's jb-mr2 changes
add new files from device's jb-mr2 branch
move libion
reset files to use proper (default) paths