coise e cena
Merge branch 'ff' into develop

Conflicts:
	src/main/dml/cookbook-manager.dml
	src/main/java/pt/ulht/es/cookbook/filter/TransactionFilter.java
	src/main/java/pt/ulht/es/cookbook/util/PropertiesManager.java