1.10 Update - #8

Open

actioninja wants to merge 2 commits into

werty1124:masterfrom

actioninja:master

Commits on Nov 28, 2016

1.10 update
actioninja
committed

Commits on Nov 29, 2016

FIxed bugs
actioninja
committed