Merge pull request #12 from AppGroup/master

map fade
more oauth fuck
marcelo changes

commiting what marcelo has done