Merge pull request #4 from iamjinge/master

2014-8-9, jiangjin
Merge pull request #5 from iamjinge/master

2014-8-9, jiangjin
add news module--haoran
 add news module --merge--haoran
Merge pull request #6 from Moonant/master

add news module--14/8/10--haoran
add Dependency Injection to electric module