CodePCR 0005a

Login works properly and displays proper main panels based on
permissions
Merge branch 'master' of https://github.com/jtander2/Coyotes-360Project

Conflicts:
	Mediware/src/com/mediware/arch/Enums/mType.java
	Mediware/src/com/mediware/display/CND.java