resources
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/project.properties
	src/data/database/ConnectionSql.java
Responsible
Merge branch 'master' of https://github.com/MarieLePanda/Usi