Bumping asset version number
Added _current_course_with_prereq_skills.js to application.rb
Added color attribute to CompetenceNodes
Added skill icons
Merge branch 'master' of github.com:tsauvine/o4
Merge branch 'colors'

Conflicts:
	app/assets/javascripts/curriculums/skill_editor/SkillModelView.js.coffee
	app/models/competence_node.rb
	db/schema.rb
Updating localizations
Merge branch 'master' of github.com:tsauvine/o4
Polishing