Issue #160 - integrate server and edit UI
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C2_Almgohar_#9_ViewOffer
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
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
Issue #160 - Integrate server
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C2_Almgohar_#9_ViewOffer
Issue #160 - Edit Strings.xml
#362 done integrating notification system
Issue #159 - remove hardcoding and add commas to arrays
Issue #168 - fix implementation reviews
Issue #168 - fix conflicts to merge
Issue #159 - bug fix
Issue #169 - fix conflicts & try with server
Issue #168 - add Splash mockup