fix
Merge branch 'master' of /Users/Ozodrukh/Documents/Android/projects/Graphics with conflicts.
Merge remote-tracking branch 'origin/master'