merge from upstream 01042014
structure update
merge dev on master
fix fog provider can't be blank
fix fog provider can't be blank
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku
add config files to heroku