Lol class commits
Merge remote-tracking branch 'origin/rework' into rework

Conflicts:
	DESIPAT phase 3/bin/View/Decorators/ModifyAssetDecorator.class
	DESIPAT phase 3/bin/View/LoginMenu.class
Merge branch 'rework' of
https://github.com/darrensapalo/desipat_phase3.git into rework

Conflicts:
	DESIPAT phase 3/bin/database.properties
	DESIPAT phase 3/src/database.properties