Merge branch 'master' of https://github.com/JeppeKnockaert/SYTYCC

Conflicts:
	app/src/main/java/com/sytycc/sytycc/app/MainActivity.java
Merge remote-tracking branch 'origin/master'