Login screen
A basic history fragment
Merge commit '37bfc5e9f208b1ab4b01c81ae42ba15606d996eb' into ui-login-screen

Conflicts:
	magiccardwall/app/app.iml
	magiccardwall/app/build.gradle
	magiccardwall/app/src/main/AndroidManifest.xml
	magiccardwall/app/src/main/res/values/strings.xml