Merge branch 'develop' of https://github.com/satamail/stardust into develop

Conflicts:
	app/src/main/java/com/binaryhydra/stardust/MainScreen.java