Minor Changes
Merge branch 'AppForCommandLine' of
https://github.com/Lucas-Andrade/Grupo-3-EHL.git into AppForCommandLine

Conflicts:
	src/airtrafficcontrol/app/appforcommandline/model/users/User.java