update
Merge branch 'master' of github.com:Namluu/php-web-developer

Conflicts:
	js/Advance.doc
	symfony2/Tom-book.doc