Merge pull request #1 from baasbox/master

update from origin repo
add img for Image resizing section
Delete .DS_Store
Delete .DS_Store
Delete .DS_Store
error in fetchAll
Merge pull request #3 from baasbox/master

update from origin
resolved conflict
added configuration
fixed some configuration issue
fixed some configuration issue
resolved conflict