add removelable function
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	pom.xml