Working on Android
Merge branch 'master' of https://github.com/MegaDevs/savey
Last android changes
Merge branch 'master' of https://github.com/MegaDevs/savey

Conflicts:
	savey_assets/.DS_Store