Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
store detail + css + edit jquery nivo
edit nivo slider
Merge pull request #22 from baotran109/master

store detail + css + edit jquery nivo
Merge remote-tracking branch 'upstream/master'
Merge pull request #29 from perselab/master

Store details