RJ commit before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/cam/dualcam/CamFrag.java
	src/com/cam/dualcam/MotherCrystal.java