Scheming-Lion/Scheming-Lion — pull request #98 by Oleg24 (2014-10-24 18:58:50+00:00)
Title: (BUG) Resolved merge conflicts

All merge conflicts resolved.