iCal Feature update
Merge remote-tracking branch 'upstream/develop' into calendar

Conflicts:
	plugins/ical/__init__.py
corrected bug in ical
Bug fix if opt not used
Merge branch 'calendar' of https://github.com/J-N-K/smarthome into develop
merging pull request from JNK. THX