Redesign - Material design
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/PSD/Aphelion.psd
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/PSD/Aphelion.psd

Signed-off-by: Nicolas ABRIC <nicolas.abric@gmail.com>