Some minor adjustments
Merge branch 'Feature/Hidde' into Copy/master

Conflicts:
	Infradox/Infradox.xcodeproj/project.pbxproj
Merge remote-tracking branch 'origin/Copy/master' into Feature/Hidde