2014-8-10,jaingjin. sync from bingyan studio
Merge pull request #6 from Moonant/master

add news module--14/8/10--haoran
add Dependency Injection to electric module
Merge pull request #7 from iamjinge/master

2014-8-10, jiangjin
2014-8-10,jiangjin. use recyclerView
Merge remote-tracking branch 'upstream/master'
Merge pull request #8 from iamjinge/master

2014-8-10，jiangjin
Merge remote-tracking branch 'studio/master'

Conflicts:
	app/src/main/java/net/bingyan/campass/module/electric/ElectricActivity.java
	app/src/main/java/net/bingyan/campass/module/electric/ElectricRecordDaoHelper.java
	app/src/main/res/layout/activity_electric_record_list.xml
	app/src/main/res/layout/electric_record_item.xml
	submodule/res/layout/activity_electric_record_list.xml