Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
file system import was after the first JFolder call. Causing issues in Joomla! 3.1
Merge pull request #103 from xtech86/master

Called import of file system earlier.