commented out unfinished chart + removed "NONE" from resource listing
Merge branch 'dev'