update
Merge branch 'master' of https://github.com/emocentmagar/jukson into prachanda
new
Merge branch 'master' of https://github.com/emocentmagar/jukson into krazz
conflict
Merge pull request #66 from emocentmagar/mitab

Mitab
video detail and sidebar
Merge branch 'master' of https://github.com/emocentmagar/jukson into prachanda
Merge pull request #67 from emocentmagar/prachanda

Prachanda
conflict
ripples added in admin nav
Merge branch 'master' of https://github.com/emocentmagar/jukson into lalit
kraz is back
kraz is back
Merge pull request #68 from emocentmagar/krazz

Krazz
kraz is back
Merge branch 'master' of https://github.com/emocentmagar/jukson into krazz
Merge pull request #69 from emocentmagar/krazz

Krazz
event final
conflicts merged