删了点注释
Merge branch 'master' of https://github.com/sorcerer310/PRoomVideo.git

Conflicts:
	src/com/bsu/promevideo/NFCTestActivity.java
Merge branch 'master' of https://github.com/sorcerer310/PRoomVideo.git
提交读写ndef数据空方法