got Donate and map working inside the nabar
Merge remote-tracking branch 'origin'
Lots of little fixes
Merge remote-tracking branch 'origin'