new ioc container
Merge remote-tracking branch 'origin/master'

Conflicts:
	.htaccess
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 2a0dd00b943f8a8535e46d5907ad50f3e672c2e8.