Merged with master.
Merge branch 'master' of https://github.com/AVATAR-PANIC/AVATAR-PANIC.git
Continued with merging