Fix some stuff.
Merge branch 'master' of github.com:heliosdesign/heliossite
Sync.
Merge branch 'master' of github.com:heliosdesign/heliossite
Merge branch 'master' into dev
Cleanup work.
Delete minified js for merging.
Fix conflict.