Merge origin/master

Conflicts:
	app/src/main/java/com/locostatmanager/busines/controllers/DownloadDataController.java
	app/src/main/webapp/WEB-INF/spring-servlet.xml

Autoincrement on table