Staging Original Site
Merge branch 'master' of https://github.com/Tryten/mage

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/Tryten/mage