Merge branch 'MASTER' of https://github.com/mikexarau/Compresor-web-app into MASTER

Author: mikexarau