merge

merged from otrdiz/devel
Loading properties
Merge branch 'devel' of https://github.com/spjass/Brojekti into spjass-devel
Merge branch 'spjass-devel' into devel

Conflicts:
	application/fi/tamk/home/brojekti/ConnectionSettings.java
	application/fi/tamk/home/brojekti/EntryUI.java
	application/fi/tamk/home/brojekti/LoginScreen.java
	application/fi/tamk/home/brojekti/SettingsLoader.java
	application/fi/tamk/home/brojekti/SingleEntry.java