Merge remote-tracking branch 'origin/master'

Conflicts:
	lokjQuery.js
	pandakapall/games.db
	views/play.php