images
Merge branch 'master' of https://github.com/KernelCorp/cakehouse

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/KernelCorp/cakehouse
images and gallery images are added
ch-16 work 1.5h
Merge branch 'master' of https://github.com/KernelCorp/cakehouse
ch-16 work 0.5h
ch-17 fixed work 0.5h
ch-16 fixed