changes in the layout, menu, flow, sessionManagement
changes in the flow, menu, sessionManagement
Merge branch 'master' of https://github.com/LampTFG/Project1

Conflicts:
	bin/classes.dex
	bin/classes/com/example/project01/ScanScreen.class
	bin/resources.ap_