Issue #159 - integrate with server
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C3_sak93_#29_acceptOffer
Issue #159 - remove commented line
#362 done integrating notification system
Issue #159 - remove hardcoding and add commas to arrays
Issue #159 - bug fix
Issue #159 - fix conflicts
Issue #159 - fix letter case
Issue #369 - Adding backend
Issue #369 - Adding route
Issue #159 - fix conflicts
Issue#375 - Deleting old bootstrap files
Issue #372 - removing old fonts
Issue#372 - Add frontend files
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C3_sak93_#29_acceptOffer
#362 tested notifications
#362 resolve conflict
#364 edit gcm reg
Issue #159 - fix conflicts
merge