Functional Login Form
merge resolving
Merge branch 'master' of https://github.com/KrasiBenassi/MickeyMouse

Conflicts:
	Application/res/values/strings.xml