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

Conflicts:
	pica/skin/frontend/picasso/default/css/styles.css
Update Loading
Merge branch 'master' of https://github.com/JohnnyLe/proj1
update toolbar