Adds fs config variables
Merge branch 'develop' of github.com:SunshinePHPHackathon/sunshinePHP into develop

Conflicts:
	config/config-sample.php