index commit
Merge branch 'master' of https://github.com/web-concept/micaheli

Conflicts:
	micaheli_theme/index-template.php
done filmstrip slide calculation
first pass on youtube api on media page integration