Change Homepage
Merge remote-tracking branch 'origin/toibalo' into toibalo

Conflicts:
	.idea/workspace.xml