init
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/web_war.xml
	.idea/artifacts/web_war_exploded.xml
	.idea/libraries/Maven__antlr_antlr_2_7_7.xml
	.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
	.idea/libraries/Maven__bouncycastle_bcmail_jdk14_138.xml
	.idea/libraries/Maven__bouncycastle_bcprov_jdk14_138.xml
	.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_2.xml
	.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_2.xml
	.idea/libraries/Maven__com_lowagie_itext_2_1_7.xml
	.idea/libraries/Maven__com_sun_faces_jsf_api_2_1_6.xml
	.idea/libraries/Maven__com_sun_faces_jsf_impl_2_1_6.xml
	.idea/libraries/Maven__commons_codec_commons_codec_1_5.xml
	.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_2.xml
	.idea/libraries/Maven__commons_io_commons_io_2_1.xml
	.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml
	.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
	.idea/libraries/Maven__javax_javaee_web_api_6_0.xml
	.idea/libraries/Maven__javax_servlet_jstl_1_2.xml
	.idea/libraries/Maven__jdom_jdom_1_0.xml
	.idea/libraries/Maven__junit_junit_3_8_1.xml
	.idea/libraries/Maven__org_apache_poi_poi_3_8.xml
	.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_8.xml
	.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_8.xml
	.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml
	.idea/libraries/Maven__org_bouncycastle_bcmail_jdk14_1_38.xml
	.idea/libraries/Maven__org_bouncycastle_bcprov_jdk14_1_38.xml
	.idea/libraries/Maven__org_bouncycastle_bctsp_jdk14_1_38.xml
	.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_1_Final.xml
	.idea/libraries/Maven__org_hibernate_hibernate_core_4_1_1_Final.xml
	.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_4_1_1_Final.xml
	.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_1_Final.xml
	.idea/libraries/Maven__org_javassist_javassist_3_15_0_GA.xml
	.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_0_GA.xml
	.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_1_spec_1_0_0_Final.xml
	.idea/libraries/Maven__org_primefaces_primefaces_3_3_1.xml
	.idea/libraries/Maven__org_primefaces_themes_flick_1_0_6.xml
	.idea/libraries/Maven__org_primefaces_themes_hot_sneaks_1_0_6.xml
	.idea/libraries/Maven__org_primefaces_themes_pepper_grinder_1_0_6.xml
	.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_4.xml
	.idea/libraries/Maven__org_springframework_spring_aop_3_1_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_asm_3_1_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_beans_3_1_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_context_3_1_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_core_3_1_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_expression_3_1_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_jdbc_3_1_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_orm_3_1_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_tx_3_1_1_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_web_3_1_1_RELEASE.xml
	.idea/libraries/Maven__postgresql_postgresql_8_4_701_jdbc3.xml
	.idea/libraries/Maven__rome_rome_1_0.xml
	.idea/libraries/Maven__stax_stax_api_1_0_1.xml
	.idea/libraries/Maven__taglibs_standard_1_1_2.xml
	.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
	Client/Client.iml
	dao/dao.iml
	entity/entity.iml
	measure.iml
	service/service.iml
	web/web.iml