-- fixed all layout with boarder
Merge branch 'issue#5.9' into issue#3.5
fixed conflicts
Conflicts:
	MobilePhotoBooth/res/layout/frame2_1_layout.xml
	MobilePhotoBooth/res/layout/frame4_18_layout.xml
	MobilePhotoBooth/src/com/trainingcenter/mobilephotobooth/TemplateActivity.java