2nd push to mica.dev
Merge branch 'master' of https://github.com/web-concept/micaheli

Conflicts:
	micaheli_theme/index.php