Adding application UI degine.
New field added email for login
Password recovery activity added.
Update to FrameLayout. All activity is FrameLayout now.
I will implement email and and password recomvery feature next time.
Just some clean up.
Fixing git problem
Merge branch 'dev' of https://github.com/madsum/SecureGallery into dev
Merging local dev and remote dev

Conflicts:
	AndroidManifest.xml
	gen/fi/masum/securegallery/R.java
	res/layout/register_user.xml
	res/values/strings.xml
	src/fi/masum/securegallery/Login.java
	src/fi/masum/securegallery/RegisterUser.java