Release-2
Merge branch 'devel' of https://github.com/spjass/Brojekti into devel

Conflicts:
	application/classes/fi/tamk/home/brojekti/Main$1.class
	application/classes/fi/tamk/home/brojekti/Main.class
	application/fi/tamk/home/brojekti/EditUI.java
	application/fi/tamk/home/brojekti/EntryManager.java
	application/fi/tamk/home/brojekti/FTPSettingsUI.java
	application/fi/tamk/home/brojekti/ImageFrame.java
	application/fi/tamk/home/brojekti/LoginScreen.java
	application/fi/tamk/home/brojekti/Main.java
	application/fi/tamk/home/brojekti/SFTPProperties.java
	application/fi/tamk/home/brojekti/SFTP_properties.txt
	application/fi/tamk/home/brojekti/UI/DBSettingsUI.java
	application/fi/tamk/home/brojekti/UI/EntryUI.java
	application/fi/tamk/home/brojekti/UI/RegisterScreen.java
	application/fi/tamk/home/brojekti/UI/SingleEntry.java
	application/fi/tamk/home/brojekti/connections/DeleteRemoteFile.java
	application/fi/tamk/home/brojekti/connections/PostPHP.java
	application/fi/tamk/home/brojekti/connections/SFTP.java
	application/fi/tamk/home/brojekti/managers/Entry.java
	application/fi/tamk/home/brojekti/managers/UserManager.java
	application/fi/tamk/home/properties/SFTP_properties.txt