Rolled back to previous commit

Rolled back to previous commit because of some issues
Merge branch 'dev' of https://github.com/cdiy/EB_LisTrackCarma into dev