mysql schema update final fixes (I hope)
added chilan
Merge branch 'master' into nicraM