edited for credits of bugfix
resolved conflicts
Merge branch 'master' of https://github.com/PhivosSatanas/HTML5Application