x-1
Merge branch 'develop' into feature/x

Conflicts:
	test.txt
x-2
Merge branch 'feature/x' into develop
test
test -- added on Dec 23, 2014