Issue #110 - solving conflicts
Issue #110 - solving conflicts
Issue #110 - solving conflicts
Issue #110 - solving conflicts
Issue #160 - integrate server and edit UI
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C2_Almgohar_#9_ViewOffer
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 #160 - Add new UI
Issue #160 - Integrate server
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C2_Almgohar_#9_ViewOffer
Issue #160 - Edit Strings.xml
Issue #110 - wokring story with the new design
Issue #110 - solving develop conflicts
Issue #110 - solving develop conflicts
#362 done integrating notification system
Issue #168 - fix implementation reviews