Move to Idea 14
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/SBT__com_codahale_metrics_metrics_core_3_0_0.xml
	.idea/libraries/SBT__com_codahale_metrics_metrics_graphite_3_0_0.xml
	.idea/libraries/SBT__com_codahale_metrics_metrics_json_3_0_0.xml
	.idea/libraries/SBT__com_codahale_metrics_metrics_jvm_3_0_0.xml
	.idea/libraries/SBT__com_esotericsoftware_kryo_kryo_2_21.xml
	.idea/libraries/SBT__com_fasterxml_jackson_core_jackson_annotations_2_3_0.xml
	.idea/libraries/SBT__com_fasterxml_jackson_core_jackson_core_2_3_1.xml
	.idea/libraries/SBT__com_fasterxml_jackson_core_jackson_databind_2_3_1.xml
	.idea/libraries/SBT__com_google_guava_guava_14_0_1.xml
	.idea/libraries/SBT__com_ning_compress_lzf_1_0_0.xml
	.idea/libraries/SBT__com_typesafe_config_1_0_2.xml
	.idea/libraries/SBT__io_netty_netty_3_6_6_Final.xml
	.idea/libraries/SBT__log4j_log4j_1_2_17.xml
	.idea/libraries/SBT__org_apache_curator_curator_client_2_4_0.xml
	.idea/libraries/SBT__org_apache_curator_curator_framework_2_4_0.xml
	.idea/libraries/SBT__org_apache_curator_curator_recipes_2_4_0.xml
	.idea/libraries/SBT__org_eclipse_jetty_orbit_javax_activation_1_1_0_v201105071233.xml
	.idea/libraries/SBT__org_eclipse_jetty_orbit_javax_mail_glassfish_1_4_1_v201005082020.xml
	.idea/libraries/SBT__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml
	.idea/libraries/SBT__org_eclipse_jetty_orbit_javax_transaction_1_1_1_v201105210645.xml
	.idea/libraries/SBT__org_spark_project_akka_akka_remote_2_10_2_2_3_shaded_protobuf.xml
	.idea/libraries/SBT__org_spark_project_akka_akka_slf4j_2_10_2_2_3_shaded_protobuf.xml
	.idea/libraries/SBT__org_xerial_snappy_snappy_java_1_0_5_3.xml
	.idea/modules/learningspark-build.iml
	.idea/modules/learningspark.iml
Move to Idea 14