changes from iMac
Merge branch 'master' of https://github.com/marvladimirovna/FlexSlider

Conflicts:
	demo/css/demo.css
	demo/index.html