Merge origin/camInterface

Conflicts:
	src/main/java/com/github/prosync/domain/Constants.java