Login Frame
fix
Oh, shit
Merge branch 'master' into LoginStuff

Conflicts:
	nbproject/private/private.xml
	src/dataSource/DBFacade.java
	src/domain/Controller.java
Everything should be working