Merge branch 'master' of https://github.com/pheelixx/Redux

Conflicts:
	machina/core.php
Merge branch 'master' of https://github.com/pheelixx/Redux