update
update
Merge branch 'master' of https://github.com/JohnnyLe/proj1

Conflicts:
	pica/app/design/frontend/picasso/default/layout/my_igallery.xml
	pica/skin/frontend/picasso/default/css/styles.css