- Work work work
Merge origin/master

Conflicts:
	jcmanager/src/main/java/za/co/dwarfsun/jcmanager/repository/JcUserRepository.java