Renaming
Merge branch 'master' of https://github.com/burbur/speedy-aggregator

Conflicts:
	src/src/logic/UserManager.java
Merge branch 'master' of https://github.com/burbur/speedy-aggregator