Merge branch 'master' of /home/vova/androidProjects/Reactr with conflicts.
add new functional