change IRcorder
Merge remote-tracking branch 'origin/master'

Conflicts:
	Templates/components.html
	app.log
	configObjData.py