new stuff
Merge branch 'master' of https://github.com/toom1984/FMUltra

Conflicts:
	www/js/jqRenderers/MainPagesRenderers/playerPageRenderer.js
	www/js/jqRenderers/MainPagesRenderers/profilePageRenderer.js