editing

Conflicts:
by.skakun.gemstones/src/by/skakun/gemstones/main/Main.java
editing
editing
edit