-
Merge remote-tracking branch 'origin/master'

Conflicts:
	nfcbeta/src/main/res/layout/fragment_showsound.xml
start working on AnimationPopUp
Merge remote-tracking branch 'origin/master'

Conflicts:
	nfcbeta/src/main/res/layout/fragment_showsound.xml
translating Toast messages
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_v4_19_1_0.xml
Merge branch 'master' of C:\Users\Noli\AndroidStudioProjects\Beta-Prototype with conflicts.
-