- gravatar property improved
- restructed code
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	index.php