create ImageEdit.java
add imagePath_view at new_dialog
add image_edit_layout.xml
move image at image_edit_layout.xml
change box_image_size and add trimming
Merge branch 'ImageEdit'

Conflicts:
	bin/classes/vc/ddns/luna/sert/collectionbox/MainActivity$1.class
	bin/classes/vc/ddns/luna/sert/collectionbox/MainActivity$2.class
	bin/classes/vc/ddns/luna/sert/collectionbox/R$id.class
	bin/classes/vc/ddns/luna/sert/collectionbox/R$layout.class
	bin/classes/vc/ddns/luna/sert/collectionbox/R$menu.class
	bin/classes/vc/ddns/luna/sert/collectionbox/R$string.class
	bin/classes/vc/ddns/luna/sert/collectionbox/R$style.class
	bin/res/drawable-nodpi/dummy.png
	bin/res/drawable-nodpi/no_image.png
	bin/resources.ap_
	gen/vc/ddns/luna/sert/collectionbox/R.java