Merge branch 'dev' into feature/ui

Conflicts:
	test/functional/solutions_controller_test.rb
Added dynamically generated language filter
Merge branch 'dev' into feature/ui
Add language to solution compact view
Merge branch 'feature/ui' into feature/pygments