Bug fix, add resize_to_fill
Add jQuery fade in
merge