Merge remote-tracking branch 'origin/shenai_cw' into shenai_cw

# Conflicts:
#	src/main/java/com/uas/eis/task/STKTask.java