Merge pull request #8 from iamjinge/master

2014-8-10，jiangjin
add submodule
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
ignore submodule
a
b
add submodule
add moduel
Merge pull request #9 from Moonant/master

add submodule
move
Merge remote-tracking branch 'upstream/master'