manifest + screen splash + game activity
Merge branch 'master' of https://github.com/vlaxim/trivia

Conflicts:
	src/com/vlaxim/trivia/GameActivity.java
Merge branch 'master' of https://github.com/vlaxim/trivia

Conflicts:
	src/com/vlaxim/trivia/GameActivity.java
plop