阶段提交20131122
Merge branch 'master' of github.com:liubenhui/datadapter

Conflicts:
	src/main/java/com/zhongying/datadapter/service/alarm/AlarmService.java
	src/main/java/com/zhongying/datadapter/service/base/CardService.java
	src/main/java/com/zhongying/datadapter/service/base/CircuitInfoService.java
	src/main/java/com/zhongying/datadapter/service/base/NetdevPortService.java
	src/main/java/com/zhongying/datadapter/service/base/NetdevService.java
	src/main/java/com/zhongying/datadapter/service/base/VlanService.java
	src/main/java/com/zhongying/datadapter/service/issue/IssueService.java
	src/main/resources/sql/1_base_card.sql
	src/main/resources/sql/1_base_netdev.sql
	src/main/resources/sql/1_base_netdevport.sql
	src/main/resources/sql/7_base_card_compare.sql
	src/main/resources/sql/7_base_netdev_compare.sql