Parametrized CardSlideActivity
Merge branch 'master' of https://github.com/egetzner/appagainsthumanity

Conflicts:
	appagainsthumanity/gen/at/tugraz/iicm/ma/appagainsthumanity/R.java
deleted gen and src folder again