Local config settings
Merge branch 'master' of git.oschina.net:luohao-brian/phonecms
Merge branch 'master' of git.oschina.net:luohao-brian/phonecms
Merge branch 'master' of git.oschina.net:luohao-brian/phonecms
Merge branch 'master' of git.oschina.net:luohao-brian/phonecms
Merge branch 'master' of git.oschina.net:luohao-brian/phonecms
Merge branch 'master' of git.oschina.net:luohao-brian/phonecms

Conflicts:
	config.py
config change on serer side.
Merge branch 'master' of git.oschina.net:luohao-brian/phonecms

Conflicts:
	config.py
remove jplayer for video list
merge videoListPlay with videoListPlayer
Display video description in videoPlay view
Merge branch 'master' of http://git.oschina.net/luohao-brian/phonecms
Optimize news content style.
Merge branch 'master' of git.oschina.net:luohao-brian/phonecms
Scale swipeshow image in the front page.
Optimize swipeshow style on the front page phase 2.
Optimize video player view.
Get rid of the margin between video and metadata on the mediaPlay view.
use mp3 as audio suffix name instead of using mpeg.