Merge pull request #9 from jakubman1/devel

Frontend UPDATE to Angular 6