Issue #110 - solving conflicts
Issue #110 - solving conflicts
Issue #110 - solving conflicts
Issue #110 - solving conflicts
Issue #110 - adding new design
Issue 168 - Adjust UI to the new standards, bug in date
Issue 168 - fix UI to standards
Issue #168 - fix conflicts with develop
Update Config.java
Issue #110 - wokring story with the new design
Issue #110 - solving develop conflicts
Issue #110 - solving develop conflicts
Issue #168 - fix implementation reviews
Issue #110 - fixing bugs
Issue #168 - fix conflicts to merge
Issue #110 - fixing bugs
Issue #110 - fixing bugs
Issue #110 - fixing conflicts
Issue #168 - add Splash mockup
Issue #110 - fixing conflicts