Merge branch 'master' of https://github.com/vrx/milson

Conflicts:
	images/logo_milson.png
	images/milson.png
	images/zz/milson.png