Various Update.
erge branch 'master' of github.com:julien-f/vates-interface-3