up
Merge branch '1.0'

Conflicts:
	wp-content/themes/larahache/slider-index-dev.php