Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop
Fixed some input stuff
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop