Adding fragments
Merge conflict
Merge branch 'master' of github.com:sisiwei/ji-data-panel-2013
Stuff