put NFC stuff in new activity. The app stays now open after the NFC service is finished, if the NFC service started the app.
Merge branch 'master' of https://github.com/swi88/YourClubMusic

Conflicts:
	src/de/uniol/yourclubmusic/MainActivity.java
fixing merge conflict