Fixing FTP security flaw
Added to stuff
Added title
Merge branch 'master' of
https://github.com/AVATAR-PANIC/AVATAR-PANIC.git

Conflicts:
	AVATAR working copy/res/layout/avatar_login.xml
	AVATAR working copy/src/DialogFragments/LoginDialogFragment.java