merge canary and stable versions
add optional modules to theme sheets
update canary theme
update gruntfile to reflect consolidated source
fix sources control styles
fix network toolbar border