Merge branch 'master' of /home/boris/AndroidStudioProjects/Sinis with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	sinis/src/main/java/net/trysk/sinis/sinis/card/DeckParser.java
ListActivity