..
Merge branch 'Version1.0' of https://github.com/Fukuyoshi/BoomProject into Version1.0

Conflicts:
	src/com/klabcyscorpions/boom/fragments/BPFragmentList.java
Merge branch 'Version1.0' of https://github.com/Fukuyoshi/BoomProject into Version1.0