Merge branch 'async' of C:\Users\Emil\Desktop\STADS3\NEW\STADS with conflicts.
Merge branch 'async' of C:\Users\Emil\Desktop\STADS3\NEW\STADS with conflicts.