1.1 and 2.1
Merge branch 'master' of https://github.com/Joyvis/save_points
algumas partes do 12