Update Javie v1.1.5

Signed-off-by: crynobone <crynobone@gmail.com>
Update Javie v1.1.6

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2

Signed-off-by: crynobone <crynobone@gmail.com>