Update Gemfile.lock
Add solution.language  to test, so that lexers don't fail
Merge branch 'dev' into feature/pygments

Conflicts:
	test/functional/solutions_controller_test.rb