merge
Merge branch 'develop'
bower
bower
bower
Merge branch 'develop'
Update jquery.chachi-slider.js
refactor finished