Two-Staged Configuration Loading
Merge remote-tracking branch 'remotes/origin/develop' into feature-detect-subfolders

Conflicts:
	src/N98/Magento/Application.php
Reinserted Sub-Folder list during Magento detection
Merge pull request #207 from amenk/feature-detect-subfolders

Feature detect subfolders