Merge branch 'master' of C:\Users\Anabela\RubymineProjects\iconfs with conflicts.