Merge origin/master

Conflicts:
	src/main/java/com/ui/uccig/NextScreenController.java
Merge origin/master