Merge branch 'master' of https://github.com/UiBuilder/TestBuilder.git

Conflicts:
	uiBuilder/src/uibuilder/EditmodeFragment.java