-add upimage code
Merge branch 'master' of github.com:hoangzinh/test

Conflicts:
	jplayer/jQuery.jPlayer.2.7.0.demos/skin/my.skin/my.skin.css