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
fix_Design
Issue 168 - Adjust UI to the new standards, bug in date
Issue #159 - integrate with server
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C3_sak93_#29_acceptOffer
add drawable
Fix conflict
Add xml Design of ClaimForm
Fix string.xml
Issue 168 - fix UI to standards
Issue #168 - fix conflicts with develop
Update Config.java
Issue #159 - remove commented line
Issue #160 - Add new UI