remove duplicated code, change upload directory, git ignore uploaded product pics
git ignore minor fix
git ignore minor fix again
Merge branch 'master' into isaac_dev