#330 - Fix conflict
Merge branch 'frontend_integration' of https://github.com/ndomar/megasoft-14 into frontend_integration