Remove duplicated directory
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/buylink_web_war_exploded.xml
	.idea/compiler.xml
	.idea/encodings.xml
	.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_1.xml
	.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_1.xml
	.idea/libraries/Maven__org_springframework_spring_aop_3_0_5_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_asm_3_0_5_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_beans_3_0_5_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_context_3_0_5_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_context_support_3_0_5_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_core_3_0_5_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_expression_3_0_5_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_web_3_0_5_RELEASE.xml
	.idea/libraries/Maven__org_springframework_spring_webmvc_3_0_5_RELEASE.xml
	.idea/misc.xml
	.idea/modules.xml
Remove idea