Merge branch 'master' of /home/nostar/AndroidStudioProjects/CANDroid with conflicts.
Incomplete end of day commit