Merge branch 'flipcards'

Conflicts:
	src/com/zabbat/flashdisplay/MainActivity.java
	src/com/zabbat/flashdisplay/view/FlashSlideAdapter.java
Refactor, rename card classes

Renames card classes,
removes an unused xml file
adds new card image
adds superclass for cards
Merge branch 'master' of https://github.com/zabbat/flashcards

Conflicts:
	src/com/zabbat/flashdisplay/MainActivity.java