update home
update
merge with VPS1 and update, remove Gemfile.lock from git repos
Merge remote-tracking branch 'origin/VPS1' into VPS1
merge with VPS1
Merge branch 'master' into VPS1
add galleryView(JQuery-Plugin)
add gallery
Merge branch 'master' into VPS0