enabled toggle on adc
resolved merge conflicts
Merge branch 'master' of https://github.com/motivate/motivate
add logo to settings