[+] Staging Test
[+] Merge Test
[+]
Merge branch 'master' of https://github.com/michaelkmartin/Magento

Conflicts:
	cron.sh
	error_log