...
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/java/com/academy/teos/controller/DataController.java
	src/main/java/com/academy/teos/controller/MainController.java
	src/main/webapp/resources/js/controllers/user_account_controller.js
...