recent update frm ofc
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/BeamDesign/DesignInputFragment.java