#7 simple fhem configuration
-fixed markup
#12 enabled twig caching
Merge pull request #13 from developerrespig/YAFF-12

#12 enabled twig caching
Merge branch 'master' into Dashboard

Conflicts:
	.gitignore