issuex1_1
issuex1_2
add feature x2
add feature x3
issuex1_3
issuex1_4
Merge branch 'featurex1'
add common function master
add common function feature x1
Merge branch 'featurex1'

Conflicts:
	README
	config/configuration