Merge branch 'basicConstitutionSupport' into develop

z
Merge branch 'master' of https://github.com/Mussie1/SWiFTfososc
Merge branch 'iss53'
log improv
improved logging: included timestamp and username
Working scala doc generator
improved documentation
Merge remote-tracking branch 'mainGitHub/develop' into develop
ScoringGraphInPlayerStats 1
1
extended version management protocol
Merge branch 'develop.generateScalaDoc' into develop
update codingprotocol, added adminhelp file, improved admin test account
debug previous
Merge remote-tracking branch 'mainGitHub/develop' into develop
Merge branch 'develop' of https://github.com/swiftgame/SWiFTfososc into develop.ScoringGraphInPlayerStats
Merge branch 'develop' of https://github.com/Mussie1/SWiFTfososc into develop.ScoringGraphInPlayerStats
Merge branch 'master' of https://github.com/Mussie1/SWiFTfososc into develop.ScoringGraphInPlayerStats
Merge branch 'develop.ScoringGraphInPlayerStats' of https://github.com/Mussie1/SWiFTfososc into develop.ScoringGraphInPlayerStats

Conflicts:
	webApp/swift/src/main/webapp/playerStats.html
Fix