.
Merge branch 'master' of github.com:wacky-tracky/wacky-tracky-client-desktop

Conflicts:
	src/main/java/wtDesktop/WindowLogin.java