js
Merge branch 'master' of https://github.com/tobilarscheid/stinder.git

Conflicts:
	donatinder/WebContent/resources/js/swiping.js