dev -> master merged
typo fixed
ck conf updated
styles added to features view