Update all gems.
Fix code highlighting for newer version of CKEditor in admin.
Merge branch 'master' into gsa

Conflicts:
	Gemfile.lock