Kommit with first desine of geekplanet
Merge branch 'master' of https://github.com/DefeNder93/mainserver

Conflicts:
	index.php

first