Revert "Revert "Revert "Merge branch 'master' of https://github.com/BeFreeCODE/RescuePrincess"""

This reverts commit bc277c1d57c8bdd601ee6a1932e8728d0933643b.