added timeout testing for ajax
Merge branch 'master' of github.com:harbdog/roguemek

Conflicts:
	grails-app/assets/javascripts/application.js