Merge branch 'master' of /Users/vslimit/RubymineProjects/tbagame with conflicts.