Merge branch 'grunt'

Merge branch 'grunt'

Conflicts:
	sonar-server/src/main/webapp/WEB-INF/app/views/coding_rules/templates/_coding_rules_detail_quality_profile_template.hbs.erb
	sonar-server/src/main/webapp/WEB-INF/app/views/coding_rules/templates/_coding_rules_detail_template.hbs.erb
	sonar-server/src/main/webapp/WEB-INF/app/views/coding_rules/templates/_coding_rules_list_item_template.hbs.erb
	sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_condition_template.hbs.erb
	sonar-server/src/main/webapp/javascripts/coding-rules/mockjax.js
	sonar-server/src/main/webapp/javascripts/coding-rules/views/coding-rules-detail-quality-profile-view.js
	sonar-server/src/main/webapp/javascripts/coding-rules/views/coding-rules-detail-view.js
	sonar-server/src/main/webapp/javascripts/quality-gate/collections/conditions.js
	sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js
	sonar-server/src/main/webapp/stylesheets/coding-rules.css
	sonar-server/src/main/webapp/stylesheets/icons.css