KhangPhucNguyen/hungphat — pull request #42 by bakawind (2012-09-14 02:13:48+00:00)
Title: fix conflict 

fix conflict in Products, ProductPhoto and Article controller