Latest Updates to dev
Merge https://github.com/mfpaniagua/TrackzFunkyIdeaz