push
Merge branch 'master' of https://github.com/bartolkaruza/capo

Conflicts:
	LightSpace/app/src/main/java/ui/activities/CapoSplashActivity.java