Merge branch 'master' of https://github.com/karenhovhannisian/iguan_tracker

Conflicts:
	src/main/java/com/webwork/controller/HomeController.java
	src/main/java/com/webwork/controller/LoginController.java
	src/main/java/com/webwork/library/util/BuildWindow.java
	src/main/java/com/webwork/main/MainApp.java
	src/main/java/com/webwork/view/Home.fxml