COM-4 Added login system as definition
Merge branch 'COM-4'