Merge origin/master

Conflicts:
	src/pe/edu/pucp/linelight/view/WindowLogin.java
Merge origin/master

Conflicts:
	src/pe/edu/pucp/linelight/view/WindowLogin.java
Merge origin/master

Conflicts:
	src/pe/edu/pucp/linelight/view/WindowLogin.java