Merge pull request #14 from KirinDave/1.6

RR 2.3.6-BETA update
RR 2.3.6a-BETA hotfix

Why hello there rushjob, how are you?
2.3.6b rolling back enderio