core
Merge branch 'core' of github.com:hell0again/oreore_rc into core