Commit b378d4bb97c6b2cca391137c0d6b97e59824c5d5

Golmote 2014-12-20T12:06:25

Merge remote-tracking branch 'origin/prism-less' into prism-less Conflicts: components.js