Multiple Updates

- Fixed invalid conditional comment
- Moved CDN assets locally
merged
Merge branch 'Braunson-master'