Merge branch 'master' into minor-fixes
minor-fixes fix casing on UnScrollable -> Unscrollable
minor-fixes move lightbox template under app, fix whitespace
Merge pull request #168 from Wikia/minor-fixes

Minor fixes for Lightbox template and ApplicationController action